linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: Linus Walleij <linus.walleij@linaro.org>,
	Alexandre Courbot <gnurou@gmail.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Vignesh R <vigneshr@ti.com>, Yong Li <yong.b.li@intel.com>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>, Wolfram Sang <wsa@the-dreams.de>,
	Peter Rosin <peda@axentia.se>
Cc: linux-i2c <linux-i2c@vger.kernel.org>,
	linux-gpio <linux-gpio@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v2 1/4] i2c: export i2c_adapter_depth()
Date: Fri, 16 Sep 2016 18:02:42 +0200	[thread overview]
Message-ID: <1474041765-17818-2-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1474041765-17818-1-git-send-email-bgolaszewski@baylibre.com>

For crazy setups in which an i2c gpio expander is behind an i2c gpio
multiplexer controlled by a gpio provided a second expander using the
same device driver we need to explicitly tell lockdep how to handle
nested locking.

Export i2c_adapter_depth() as public API to be reused outside of i2c
core code.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 drivers/i2c/i2c-core.c | 9 ++-------
 include/linux/i2c.h    | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index da3a02e..c9b8df8 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1335,13 +1335,7 @@ static void i2c_adapter_dev_release(struct device *dev)
 	complete(&adap->dev_released);
 }
 
-/*
- * This function is only needed for mutex_lock_nested, so it is never
- * called unless locking correctness checking is enabled. Thus we
- * make it inline to avoid a compiler warning. That's what gcc ends up
- * doing anyway.
- */
-static inline unsigned int i2c_adapter_depth(struct i2c_adapter *adapter)
+unsigned int i2c_adapter_depth(struct i2c_adapter *adapter)
 {
 	unsigned int depth = 0;
 
@@ -1350,6 +1344,7 @@ static inline unsigned int i2c_adapter_depth(struct i2c_adapter *adapter)
 
 	return depth;
 }
+EXPORT_SYMBOL_GPL(i2c_adapter_depth);
 
 /*
  * Let users instantiate I2C devices through sysfs. This can be used when
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index fffdc27..cfacc03 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -673,6 +673,7 @@ extern void i2c_clients_command(struct i2c_adapter *adap,
 
 extern struct i2c_adapter *i2c_get_adapter(int nr);
 extern void i2c_put_adapter(struct i2c_adapter *adap);
+extern unsigned int i2c_adapter_depth(struct i2c_adapter *adapter);
 
 void i2c_parse_fw_timings(struct device *dev, struct i2c_timings *t, bool use_defaults);
 
-- 
2.7.4

  reply	other threads:[~2016-09-16 16:03 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-16 16:02 [PATCH v2 0/4] gpio: fix an incorrect lockdep warning Bartosz Golaszewski
2016-09-16 16:02 ` Bartosz Golaszewski [this message]
2016-09-16 16:02 ` [PATCH v2 2/4] lockdep: make MAX_LOCKDEP_SUBCLASSES unconditionally visible Bartosz Golaszewski
2016-09-16 16:02 ` [PATCH v2 3/4] i2c: add a warning to i2c_adapter_depth() Bartosz Golaszewski
2016-09-16 16:02 ` [PATCH v2 4/4] gpio: pca953x: fix an incorrect lockdep warning Bartosz Golaszewski
2016-09-21  5:45   ` Wolfram Sang
2016-09-23  8:10     ` Linus Walleij
2016-09-24  8:55       ` Wolfram Sang
2016-09-24  9:15   ` Wolfram Sang
2016-09-24 14:26     ` Geert Uytterhoeven
2016-09-16 17:26 ` [PATCH v2 0/4] gpio: " Wolfram Sang
2016-09-16 17:45   ` Peter Rosin
2016-09-16 17:58     ` Wolfram Sang
2016-09-18  8:52       ` Peter Rosin
2016-09-18 19:43         ` Bartosz Golaszewski
2016-09-18 19:45           ` Bartosz Golaszewski
2016-09-19  8:01             ` Peter Rosin
2016-09-19  8:14               ` Peter Zijlstra
2016-09-19  8:48                 ` Peter Rosin
2016-09-19  9:03                   ` Peter Zijlstra
2016-09-20  8:48                     ` Peter Rosin
2016-09-20 10:07                       ` Bartosz Golaszewski
2016-09-20 10:28                         ` Peter Zijlstra
2016-09-20 10:48                         ` Peter Rosin
2016-09-20 11:30                           ` Geert Uytterhoeven
2016-09-20 12:32                             ` Bartosz Golaszewski
2016-09-20 15:33                       ` Thomas Gleixner
2016-09-21  9:47                         ` Peter Rosin
2016-09-17  1:19 ` Peter Zijlstra
2016-09-17 10:18   ` Wolfram Sang
2016-09-17 18:59     ` Bartosz Golaszewski
2016-09-24  8:56 ` 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=1474041765-17818-2-git-send-email-bgolaszewski@baylibre.com \
    --to=bgolaszewski@baylibre.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=geert+renesas@glider.be \
    --cc=gnurou@gmail.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peda@axentia.se \
    --cc=peterz@infradead.org \
    --cc=vigneshr@ti.com \
    --cc=wsa@the-dreams.de \
    --cc=yong.b.li@intel.com \
    /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;
as well as URLs for NNTP newsgroup(s).