From: Peter Rosin <peda@axentia.se>
To: linux-kernel@vger.kernel.org
Cc: Peter Rosin <peda@axentia.se>, Wolfram Sang <wsa@the-dreams.de>,
Stephen Warren <swarren@nvidia.com>,
linux-i2c@vger.kernel.org
Subject: [PATCH 2/2] i2c: mux: pinctrl: drop the idle_state member
Date: Wed, 2 Aug 2017 09:27:28 +0200 [thread overview]
Message-ID: <20170802072728.24586-3-peda@axentia.se> (raw)
In-Reply-To: <20170802072728.24586-1-peda@axentia.se>
The information is available elsewhere.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/i2c/muxes/i2c-mux-pinctrl.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index aa4a3bf9507f..20b90a7a1e61 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -28,7 +28,6 @@
struct i2c_mux_pinctrl {
struct pinctrl *pinctrl;
struct pinctrl_state **states;
- struct pinctrl_state *state_idle;
};
static int i2c_mux_pinctrl_select(struct i2c_mux_core *muxc, u32 chan)
@@ -40,9 +39,7 @@ static int i2c_mux_pinctrl_select(struct i2c_mux_core *muxc, u32 chan)
static int i2c_mux_pinctrl_deselect(struct i2c_mux_core *muxc, u32 chan)
{
- struct i2c_mux_pinctrl *mux = i2c_mux_priv(muxc);
-
- return pinctrl_select_state(mux->pinctrl, mux->state_idle);
+ return i2c_mux_pinctrl_select(muxc, muxc->num_adapters);
}
static struct i2c_adapter *i2c_mux_pinctrl_root_adapter(
@@ -149,7 +146,6 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
ret = -EINVAL;
goto err_put_parent;
}
- mux->state_idle = mux->states[i];
muxc->deselect = i2c_mux_pinctrl_deselect;
}
@@ -166,7 +162,7 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
dev_info(dev, "mux-locked i2c mux\n");
/* Do not add any adapter for the idle state (if it's there at all). */
- for (i = 0; i < num_names - !!mux->state_idle; i++) {
+ for (i = 0; i < num_names - !!muxc->deselect; i++) {
ret = i2c_mux_add_adapter(muxc, 0, i, 0);
if (ret)
goto err_del_adapter;
--
2.11.0
next prev parent reply other threads:[~2017-08-02 7:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-02 7:27 [PATCH 0/2] i2c: mux: pinctrl: remove platform_data and cleanup Peter Rosin
2017-08-02 7:27 ` [PATCH 1/2] i2c: mux: pinctrl: remove platform_data Peter Rosin
2017-08-02 19:05 ` Stephen Warren
2017-08-02 21:19 ` Peter Rosin
2017-08-12 14:12 ` Wolfram Sang
2017-08-02 7:27 ` Peter Rosin [this message]
2017-08-02 19:06 ` [PATCH 2/2] i2c: mux: pinctrl: drop the idle_state member Stephen Warren
2017-08-02 21:25 ` Peter Rosin
2017-08-02 22:50 ` Stephen Warren
2017-08-03 5:19 ` Peter Rosin
2017-08-03 21:41 ` Stephen Warren
2017-08-15 7:00 ` [PATCH 0/2] i2c: mux: pinctrl: remove platform_data and cleanup Peter Rosin
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=20170802072728.24586-3-peda@axentia.se \
--to=peda@axentia.se \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=swarren@nvidia.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