Skip to contentSkip to conversation

i2c: davinci: rename "i2c_recover_bus" function

PATCH In review Arnd Bergmann 4 participants 4 messages Apr 4, 2013 – Apr 5, 2013 2 messages not in the archive

Subsystems (2)
I2C subsystem host drivers TI DaVinci machine support
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 i2c: davinci: rename "i2c_recover_bus" function

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 <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc [email protected]
Cc davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org
Cc Wolfram Sang <wsa-z923LK4zBo2bacvFa/[email protected]>
Cc Ben Dooks <[email protected]>
drivers/i2c/busses/i2c-davinci.c +3 -3
index 7d1e590..3acc65a 100644
@@ -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;

A message that is not in the archive (sent off-list or not yet received): [email protected]

Acked-by
#2 lore raw
Quoted 11 lines · 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 <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc [email protected]
Cc davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org
Cc Wolfram Sang <wsa-z923LK4zBo2bacvFa/[email protected]>
Cc Ben Dooks <[email protected]>
Acked-by Viresh Kumar <[email protected]>

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?

A message that is not in the archive (sent off-list or not yet received): CAKohpomq6YzfftrHEnx5gqxjK8bagaRZbH=e_f2ZaRVgAspHkw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#4 lore raw
Quoted 13 lines · Viresh Kumar
Quoted 11 lines · 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 <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc [email protected]
Cc davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org
Cc Wolfram Sang <wsa-z923LK4zBo2bacvFa/[email protected]>
Cc Ben Dooks <[email protected]>
Quoted 6 lines
Acked-by Viresh Kumar <[email protected]>

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