From: Doug Anderson <dianders@chromium.org>
To: Wolfram Sang <w.sang@pengutronix.de>
Cc: Simon Glass <sjg@chromium.org>,
Naveen Krishna Chatradhi <ch.naveen@samsung.com>,
Grant Likely <grant.likely@secretlab.ca>,
Yuvaraj Kumar <yuvaraj.cd@gmail.com>,
Ben Dooks <ben.dooks@codethink.co.uk>,
u.kleine-koenig@pengutronix.de,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Girish Shivananjappa <girish.shivananjappa@linaro.org>,
bhushan.r@samsung.com, sreekumar.c@samsung.com,
Prashanth G <prashanth.g@samsung.com>,
Olof Johansson <olof@lixom.net>,
Daniel Kurtz <djkurtz@chromium.org>,
Grant Grundler <grundler@chromium.org>,
Doug Anderson <dianders@chromium.org>,
"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>,
Peter Korsgaard <peter.korsgaard@barco.com>,
Guenter Roeck <linux@roeck-us.net>,
Jean Delvare <khali@linux-fr.org>,
David Daney <david.daney@cavium.com>,
Axel Lin <axel.lin@gmail.com>,
Stephen Warren <swarren@nvidia.com>,
Barry Song <baohua.song@csr.com>,
Guan Xuetao <gxt@mprc.pku.edu.cn>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 4/4] i2c-mux: i2c_add_mux_adapter() should use -1 for auto bus num
Date: Wed, 13 Feb 2013 10:02:12 -0800 [thread overview]
Message-ID: <1360778532-7480-4-git-send-email-dianders@chromium.org> (raw)
In-Reply-To: <1360778532-7480-1-git-send-email-dianders@chromium.org>
The force_nr parameter to i2c_add_mux_adapter() uses 0 to signify that
we don't want to force the bus number of the adapter. This is
non-ideal because:
* 0 is actually a valid bus number to request
* i2c_add_numbered_adapter() (which i2c_add_mux_adapter() calls) uses
-1 to mean the same thing. That means extra logic in
i2c_add_mux_adapter().
Fix i2c_add_mux_adapter() to use -1 and update all mux drivers
accordingly.
Signed-off-by: Doug Anderson <dianders@chromium.org>
---
Notes:
- If there's a good reason that force_nr uses 0 for auto then feel
free to drop this patch. I've place it at the end of the series to
make it easy to just drop it.
drivers/i2c/i2c-mux.c | 10 +++-------
drivers/i2c/muxes/i2c-arbitrator.c | 2 +-
drivers/i2c/muxes/i2c-mux-gpio.c | 2 +-
drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +-
drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +-
drivers/i2c/muxes/i2c-mux-pinctrl.c | 4 ++--
include/linux/i2c-mux.h | 2 +-
7 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index d94e0ce..8ad1a56 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -103,7 +103,7 @@ static unsigned int i2c_mux_parent_classes(struct i2c_adapter *parent)
struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
struct device *mux_dev,
- void *mux_priv, u32 force_nr, u32 chan_id,
+ void *mux_priv, int force_nr, u32 chan_id,
unsigned int class,
int (*select) (struct i2c_adapter *,
void *, u32),
@@ -168,12 +168,8 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
}
}
- if (force_nr) {
- priv->adap.nr = force_nr;
- ret = i2c_add_numbered_adapter(&priv->adap);
- } else {
- ret = i2c_add_adapter(&priv->adap);
- }
+ priv->adap.nr = force_nr;
+ ret = i2c_add_numbered_adapter(&priv->adap);
if (ret < 0) {
dev_err(&parent->dev,
"failed to add mux-adapter (error=%d)\n",
diff --git a/drivers/i2c/muxes/i2c-arbitrator.c b/drivers/i2c/muxes/i2c-arbitrator.c
index c3bbdf7..89d0d06 100644
--- a/drivers/i2c/muxes/i2c-arbitrator.c
+++ b/drivers/i2c/muxes/i2c-arbitrator.c
@@ -173,7 +173,7 @@ static int i2c_arbitrator_probe(struct platform_device *pdev)
arb->wait_free_us = 50000;
/* Actually add the mux adapter */
- arb->child = i2c_add_mux_adapter(arb->parent, &pdev->dev, arb, 0, 0, 0,
+ arb->child = i2c_add_mux_adapter(arb->parent, &pdev->dev, arb, -1, 0, 0,
i2c_arbitrator_select,
i2c_arbitrator_deselect);
if (WARN_ON(!arb->child)) {
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 9f50ef0..301ed0b 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -208,7 +208,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
}
for (i = 0; i < mux->data.n_values; i++) {
- u32 nr = mux->data.base_nr ? (mux->data.base_nr + i) : 0;
+ int nr = mux->data.base_nr ? (mux->data.base_nr + i) : -1;
unsigned int class = mux->data.classes ? mux->data.classes[i] : 0;
mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux, nr,
diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
index f3b8f9a..a58b3c2 100644
--- a/drivers/i2c/muxes/i2c-mux-pca9541.c
+++ b/drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -350,7 +350,7 @@ static int pca9541_probe(struct i2c_client *client,
/* Create mux adapter */
- force = 0;
+ force = -1;
if (pdata)
force = pdata->modes[0].adap_id;
data->mux_adap = i2c_add_mux_adapter(adap, &client->dev, client,
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 8e43872..4663ce6 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -215,7 +215,7 @@ static int pca954x_probe(struct i2c_client *client,
/* Now create an adapter for each channel */
for (num = 0; num < chips[data->type].nchans; num++) {
- force = 0; /* dynamic adap number */
+ force = -1; /* dynamic adap number */
class = 0; /* no class by default */
if (pdata) {
if (num < pdata->num_modes) {
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index a43c0ce..401ff5d 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -217,8 +217,8 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
}
for (i = 0; i < mux->pdata->bus_count; i++) {
- u32 bus = mux->pdata->base_bus_num ?
- (mux->pdata->base_bus_num + i) : 0;
+ int bus = mux->pdata->base_bus_num ?
+ (mux->pdata->base_bus_num + i) : -1;
mux->busses[i] = i2c_add_mux_adapter(mux->parent, &pdev->dev,
mux, bus, i, 0,
diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h
index 40cb05a..a7bfb55 100644
--- a/include/linux/i2c-mux.h
+++ b/include/linux/i2c-mux.h
@@ -35,7 +35,7 @@
*/
struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
struct device *mux_dev,
- void *mux_priv, u32 force_nr, u32 chan_id,
+ void *mux_priv, int force_nr, u32 chan_id,
unsigned int class,
int (*select) (struct i2c_adapter *,
void *mux_dev, u32 chan_id),
--
1.8.1
next prev parent reply other threads:[~2013-02-13 18:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-13 18:02 [PATCH v1 1/4] i2c: mux: Add i2c-arbitrator 'mux' driver Doug Anderson
2013-02-13 18:02 ` [PATCH v1 2/4] ARM: dts: Add i2c-arbitrator bus for exynos5250-snow Doug Anderson
2013-02-13 21:04 ` Stephen Warren
2013-02-14 0:38 ` Doug Anderson
2013-02-14 4:42 ` Stephen Warren
2013-02-13 18:02 ` [PATCH v1 3/4] ARM: dts: Add sbs-battery " Doug Anderson
2013-02-13 18:02 ` Doug Anderson [this message]
2013-02-13 20:34 ` [PATCH v1 4/4] i2c-mux: i2c_add_mux_adapter() should use -1 for auto bus num Guenter Roeck
2013-02-13 21:09 ` Stephen Warren
2013-02-14 7:15 ` Jean Delvare
2013-02-13 18:45 ` [PATCH v1 1/4] i2c: mux: Add i2c-arbitrator 'mux' driver Olof Johansson
2013-02-13 18:49 ` Olof Johansson
2013-02-13 21:02 ` Stephen Warren
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=1360778532-7480-4-git-send-email-dianders@chromium.org \
--to=dianders@chromium.org \
--cc=axel.lin@gmail.com \
--cc=baohua.song@csr.com \
--cc=ben-linux@fluff.org \
--cc=ben.dooks@codethink.co.uk \
--cc=bhushan.r@samsung.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=ch.naveen@samsung.com \
--cc=david.daney@cavium.com \
--cc=djkurtz@chromium.org \
--cc=girish.shivananjappa@linaro.org \
--cc=grant.likely@secretlab.ca \
--cc=grundler@chromium.org \
--cc=gxt@mprc.pku.edu.cn \
--cc=khali@linux-fr.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=olof@lixom.net \
--cc=peter.korsgaard@barco.com \
--cc=prashanth.g@samsung.com \
--cc=sjg@chromium.org \
--cc=sreekumar.c@samsung.com \
--cc=swarren@nvidia.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=w.sang@pengutronix.de \
--cc=yuvaraj.cd@gmail.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
Powered by JetHome