From: Peter Rosin <peda@axentia.se>
To: <linux-kernel@vger.kernel.org>
Cc: Peter Rosin <peda@axentia.se>, Wolfram Sang <wsa@the-dreams.de>,
Jonathan Corbet <corbet@lwn.net>,
Peter Korsgaard <peter.korsgaard@barco.com>,
Guenter Roeck <linux@roeck-us.net>,
Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald <pmeerw@pmeerw.net>,
Antti Palosaari <crope@iki.fi>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Grant Likely <grant.likely@linaro.org>,
Andrew Morton <akpm@linux-foundation.org>,
"David S. Miller" <davem@davemloft.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kalle Valo <kvalo@codeaurora.org>, Jiri Slaby <jslaby@suse.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Matt Ranostay <matt.ranostay@intel.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Terry Heo <terryheo@google.com>, Arnd Bergmann <arnd@arndb.de>,
Tommi Rantala <tt.rantala@gmail.com>,
Crestez Dan Leonard <leonard.crestez@intel.com>,
<linux-i2c@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<linux-iio@vger.kernel.org>, <linux-media@vger.kernel.org>,
<devicetree@vger.kernel.org>
Subject: [PATCH v9 9/9] [media] rtl2832: regmap is aware of lockdep, drop local locking hack
Date: Wed, 4 May 2016 22:15:35 +0200 [thread overview]
Message-ID: <1462392935-28011-10-git-send-email-peda@axentia.se> (raw)
In-Reply-To: <1462392935-28011-1-git-send-email-peda@axentia.se>
Tested-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/media/dvb-frontends/rtl2832.c | 30 ------------------------------
drivers/media/dvb-frontends/rtl2832_priv.h | 1 -
2 files changed, 31 deletions(-)
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index 957523f07f61..bfb6beedd40b 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -890,32 +890,6 @@ static bool rtl2832_volatile_reg(struct device *dev, unsigned int reg)
return false;
}
-/*
- * FIXME: Hack. Implement own regmap locking in order to silence lockdep
- * recursive lock warning. That happens when regmap I2C client calls I2C mux
- * adapter, which leads demod I2C repeater enable via demod regmap. Operation
- * takes two regmap locks recursively - but those are different regmap instances
- * in a two different I2C drivers, so it is not deadlock. Proper fix is to make
- * regmap aware of lockdep.
- */
-static void rtl2832_regmap_lock(void *__dev)
-{
- struct rtl2832_dev *dev = __dev;
- struct i2c_client *client = dev->client;
-
- dev_dbg(&client->dev, "\n");
- mutex_lock(&dev->regmap_mutex);
-}
-
-static void rtl2832_regmap_unlock(void *__dev)
-{
- struct rtl2832_dev *dev = __dev;
- struct i2c_client *client = dev->client;
-
- dev_dbg(&client->dev, "\n");
- mutex_unlock(&dev->regmap_mutex);
-}
-
static struct dvb_frontend *rtl2832_get_dvb_frontend(struct i2c_client *client)
{
struct rtl2832_dev *dev = i2c_get_clientdata(client);
@@ -1082,12 +1056,8 @@ static int rtl2832_probe(struct i2c_client *client,
dev->sleeping = true;
INIT_DELAYED_WORK(&dev->i2c_gate_work, rtl2832_i2c_gate_work);
/* create regmap */
- mutex_init(&dev->regmap_mutex);
dev->regmap_config.reg_bits = 8,
dev->regmap_config.val_bits = 8,
- dev->regmap_config.lock = rtl2832_regmap_lock,
- dev->regmap_config.unlock = rtl2832_regmap_unlock,
- dev->regmap_config.lock_arg = dev,
dev->regmap_config.volatile_reg = rtl2832_volatile_reg,
dev->regmap_config.max_register = 5 * 0x100,
dev->regmap_config.ranges = regmap_range_cfg,
diff --git a/drivers/media/dvb-frontends/rtl2832_priv.h b/drivers/media/dvb-frontends/rtl2832_priv.h
index d8f97d14f6fd..c1a8a69e9015 100644
--- a/drivers/media/dvb-frontends/rtl2832_priv.h
+++ b/drivers/media/dvb-frontends/rtl2832_priv.h
@@ -33,7 +33,6 @@
struct rtl2832_dev {
struct rtl2832_platform_data *pdata;
struct i2c_client *client;
- struct mutex regmap_mutex;
struct regmap_config regmap_config;
struct regmap *regmap;
struct i2c_mux_core *muxc;
--
2.1.4
next prev parent reply other threads:[~2016-05-04 20:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 20:15 [PATCH v9 0/9] i2c mux cleanup and locking update Peter Rosin
2016-05-04 20:15 ` [PATCH v9 1/9] i2c: allow adapter drivers to override the adapter locking Peter Rosin
2016-05-04 20:15 ` [PATCH v9 2/9] i2c: muxes always lock the parent adapter Peter Rosin
2016-05-04 20:15 ` [PATCH v9 3/9] i2c-mux: relax locking of the top i2c adapter during mux-locked muxing Peter Rosin
2016-05-04 20:15 ` [PATCH v9 4/9] i2c-mux: document i2c muxes and elaborate on parent-/mux-locked muxes Peter Rosin
2016-05-04 20:15 ` [PATCH v9 5/9] iio: imu: inv_mpu6050: change the i2c gate to be mux-locked Peter Rosin
2016-05-04 20:15 ` [PATCH v9 6/9] [media] si2168: " Peter Rosin
2016-05-04 20:15 ` [PATCH v9 7/9] [media] rtl2832: " Peter Rosin
2016-05-04 20:15 ` [PATCH v9 8/9] [media] rtl2832_sdr: get rid of empty regmap wrappers Peter Rosin
2016-05-04 20:15 ` Peter Rosin [this message]
2016-05-04 20:42 ` [PATCH v9 0/9] i2c mux cleanup and locking update Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462392935-28011-10-git-send-email-peda@axentia.se \
--to=peda@axentia.se \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=crope@iki.fi \
--cc=daniel.baluta@intel.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hans.verkuil@cisco.com \
--cc=jic23@kernel.org \
--cc=jslaby@suse.com \
--cc=k.kozlowski@samsung.com \
--cc=knaack.h@gmx.de \
--cc=kvalo@codeaurora.org \
--cc=lars@metafoo.de \
--cc=leonard.crestez@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=lucas.demarchi@intel.com \
--cc=matt.ranostay@intel.com \
--cc=mchehab@osg.samsung.com \
--cc=peter.korsgaard@barco.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=terryheo@google.com \
--cc=tt.rantala@gmail.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®