| Message ID | 201304041354.30024.arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 4 April 2013 19:24, Arnd Bergmann <arnd@arndb.de> wrote: > As of commit 5f9296ba "i2c: Add bus recovery infrastructure", there > is now a global function with the same name, which clashes with > the davinci specific one. The obvious solution is to rename the > function with a davinci prefix. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Viresh Kumar <viresh.kumar@linaro.org> > Cc: linux-i2c@vger.kernel.org > Cc: davinci-linux-open-source@linux.davincidsp.com > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: Ben Dooks <ben-linux@fluff.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> But i believe this stuff should be updated to use the generic recovery infrastructure, as it is in now. @Sekhar: Are you looking after it?
On Thu, Apr 04, 2013 at 01:54:29PM +0000, Arnd Bergmann wrote: > As of commit 5f9296ba "i2c: Add bus recovery infrastructure", there > is now a global function with the same name, which clashes with > the davinci specific one. The obvious solution is to rename the > function with a davinci prefix. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> adf68acf387a203d76315d72b36b829bde1d01b6 in linux-next of today. Thanks!
On 4/4/2013 7:37 PM, Viresh Kumar wrote: > On 4 April 2013 19:24, Arnd Bergmann <arnd@arndb.de> wrote: >> As of commit 5f9296ba "i2c: Add bus recovery infrastructure", there >> is now a global function with the same name, which clashes with >> the davinci specific one. The obvious solution is to rename the >> function with a davinci prefix. >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> Cc: Viresh Kumar <viresh.kumar@linaro.org> >> Cc: linux-i2c@vger.kernel.org >> Cc: davinci-linux-open-source@linux.davincidsp.com >> Cc: Wolfram Sang <wsa@the-dreams.de> >> Cc: Ben Dooks <ben-linux@fluff.org> > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > > But i believe this stuff should be updated to use the generic recovery > infrastructure, as it is in now. > > @Sekhar: Are you looking after it? No, not in my plans ATM. Thanks, Sekhar
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 7d1e590..3acc65a 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -155,7 +155,7 @@ static void generic_i2c_clock_pulse(unsigned int scl_pin) /* This routine does i2c bus recovery as specified in the * i2c protocol Rev. 03 section 3.16 titled "Bus clear" */ -static void i2c_recover_bus(struct davinci_i2c_dev *dev) +static void i2c_davinci_recover_bus(struct davinci_i2c_dev *dev) { u32 flag = 0; struct davinci_i2c_platform_data *pdata = dev->pdata; @@ -289,7 +289,7 @@ static int i2c_davinci_wait_bus_not_busy(struct davinci_i2c_dev *dev, return -ETIMEDOUT; } else { to_cnt = 0; - i2c_recover_bus(dev); + i2c_davinci_recover_bus(dev); i2c_davinci_init(dev); } } @@ -379,7 +379,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) dev->adapter.timeout); if (r == 0) { dev_err(dev->dev, "controller timed out\n"); - i2c_recover_bus(dev); + i2c_davinci_recover_bus(dev); i2c_davinci_init(dev); dev->buf_len = 0; return -ETIMEDOUT;
As of commit 5f9296ba "i2c: Add bus recovery infrastructure", there is now a global function with the same name, which clashes with the davinci specific one. The obvious solution is to rename the function with a davinci prefix. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: linux-i2c@vger.kernel.org Cc: davinci-linux-open-source@linux.davincidsp.com Cc: Wolfram Sang <wsa@the-dreams.de> Cc: Ben Dooks <ben-linux@fluff.org>