Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc204671 authored by Peter Rosin's avatar Peter Rosin
Browse files

i2c: mux: pinctrl: drop the idle_state member 



The information is available elsewhere.

Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
parent c4aee3e1

drivers/i2c/muxes/i2c-mux-pinctrl.c

+2 −6
Original line number Diff line number Diff line
@@ -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;