diff options
| author |   David Daney <david.daney@cavium.com> | 2012-04-12 14:14:22 -0700 |
|---|---|---|
| committer |   Wolfram Sang <w.sang@pengutronix.de> | 2012-05-12 14:28:15 +0200 |
| commit | 5a3ecd5f9877b963a581ca5d4495a1a24dafc88c (patch) | |
| tree | 9a027ed9fa53e859f79b007f5e661324cf9bfd60 /drivers/i2c/muxes | |
| parent | of/i2c: call i2c_verify_client from of_find_i2c_device_by_node (diff) | |
| download | linux-dev-5a3ecd5f9877b963a581ca5d4495a1a24dafc88c.tar.xz linux-dev-5a3ecd5f9877b963a581ca5d4495a1a24dafc88c.zip | |
i2c: Add a struct device * parameter to i2c_add_mux_adapter()
And adjust all callers.
The new device parameter is used in the next patch to initialize the
mux's of_node so that its children may be automatically populated.
Signed-off-by: David Daney <david.daney@cavium.com>
Tested-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c/muxes')
| -rw-r--r-- | drivers/i2c/muxes/gpio-i2cmux.c | 3 | ||||
| -rw-r--r-- | drivers/i2c/muxes/pca9541.c | 3 | ||||
| -rw-r--r-- | drivers/i2c/muxes/pca954x.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/i2c/muxes/gpio-i2cmux.c b/drivers/i2c/muxes/gpio-i2cmux.c index e5fa695eb0fa..fc5c1ef9b6ec 100644 --- a/drivers/i2c/muxes/gpio-i2cmux.c +++ b/drivers/i2c/muxes/gpio-i2cmux.c @@ -105,7 +105,8 @@ static int __devinit gpiomux_probe(struct platform_device *pdev) for (i = 0; i < pdata->n_values; i++) { u32 nr = pdata->base_nr ? (pdata->base_nr + i) : 0; - mux->adap[i] = i2c_add_mux_adapter(parent, mux, nr, i, + mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux, + nr, i, gpiomux_select, deselect); if (!mux->adap[i]) { ret = -ENODEV; diff --git a/drivers/i2c/muxes/pca9541.c b/drivers/i2c/muxes/pca9541.c index e0df9b6c66b3..8aacde1516ac 100644 --- a/drivers/i2c/muxes/pca9541.c +++ b/drivers/i2c/muxes/pca9541.c @@ -353,7 +353,8 @@ static int pca9541_probe(struct i2c_client *client, force = 0; if (pdata) force = pdata->modes[0].adap_id; - data->mux_adap = i2c_add_mux_adapter(adap, client, force, 0, + data->mux_adap = i2c_add_mux_adapter(adap, &client->dev, client, + force, 0, pca9541_select_chan, pca9541_release_chan); diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c index 0e37ef27aa12..f2dfe0d8fcce 100644 --- a/drivers/i2c/muxes/pca954x.c +++ b/drivers/i2c/muxes/pca954x.c @@ -226,7 +226,7 @@ static int pca954x_probe(struct i2c_client *client, } data->virt_adaps[num] = - i2c_add_mux_adapter(adap, client, + i2c_add_mux_adapter(adap, &client->dev, client, force, num, pca954x_select_chan, (pdata && pdata->modes[num].deselect_on_exit) ? pca954x_deselect_mux : NULL); |