[PATCH] i2c: davinci: rename "i2c_recover_bus" function

[PATCH] i2c: davinci: rename "i2c_recover_bus" function

[Arnd Bergmann]

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-r2nGTMty4D4@public.gmane.org>
Cc: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org
Cc: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>

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;

Re: [PATCH] i2c: davinci: rename "i2c_recover_bus" function

[Viresh Kumar]

On 4 April 2013 19:24, Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> 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-r2nGTMty4D4@public.gmane.org>
> Cc: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org
> Cc: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
> Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>

Acked-by: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.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?

Re: [PATCH] i2c: davinci: rename "i2c_recover_bus" function

[Wolfram Sang]

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-r2nGTMty4D4@public.gmane.org>

adf68acf387a203d76315d72b36b829bde1d01b6 in linux-next of today.

Thanks!

Re: [PATCH] i2c: davinci: rename "i2c_recover_bus" function

[Sekhar Nori]

On 4/4/2013 7:37 PM, Viresh Kumar wrote:
> On 4 April 2013 19:24, Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> 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-r2nGTMty4D4@public.gmane.org>
>> Cc: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>> Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> Cc: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org
>> Cc: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
>> Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
> 
> Acked-by: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.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