2012-08-02 09:18:04

by Venu Byravarasu

[permalink] [raw]
Subject: [PATCH] i2c: muxes: fix build break

Seems a new parameter is added to i2c_add_mux_adapter().
All its references, except for the one present in
i2c-mux-pinctrl.c, were updated.
As this is causing build break, pushing current patch to fix it.

Signed-off-by: Venu Byravarasu <[email protected]>
---
drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index 46a6697..5f097f3 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -221,7 +221,7 @@ static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev)
(mux->pdata->base_bus_num + i) : 0;

mux->busses[i] = i2c_add_mux_adapter(mux->parent, &pdev->dev,
- mux, bus, i,
+ mux, bus, i, 0,
i2c_mux_pinctrl_select,
deselect);
if (!mux->busses[i]) {
--
1.7.1.1


2012-08-02 09:53:46

by Jean Delvare

[permalink] [raw]
Subject: Re: [PATCH] i2c: muxes: fix build break

Hi Venu,

On Thu, 2 Aug 2012 14:42:17 +0530, Venu Byravarasu wrote:
> Seems a new parameter is added to i2c_add_mux_adapter().
> All its references, except for the one present in
> i2c-mux-pinctrl.c, were updated.
> As this is causing build break, pushing current patch to fix it.

Thanks for the heads up. When I wrote the patch adding the parameter,
the i2c-mux-pinctrl driver wasn't upstream yet, that's why I missed it.

>
> Signed-off-by: Venu Byravarasu <[email protected]>
> ---
> drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
> index 46a6697..5f097f3 100644
> --- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
> +++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
> @@ -221,7 +221,7 @@ static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev)
> (mux->pdata->base_bus_num + i) : 0;
>
> mux->busses[i] = i2c_add_mux_adapter(mux->parent, &pdev->dev,
> - mux, bus, i,
> + mux, bus, i, 0,
> i2c_mux_pinctrl_select,
> deselect);
> if (!mux->busses[i]) {

As the problematic patch isn't upstream yet, I've simply folded the
above into it:
http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/i2c-mux-support-class.patch

Thanks again,
--
Jean Delvare