From: David Brownell Subject: i2c: Rename dev_to_i2c_adapter() Rename dev_to_i2c_adapter() as to_i2c_adapter(), since the previous syntax was a surprising and needless difference from normal naming conventions in Linux. Signed-off-by: David Brownell Signed-off-by: Jean Delvare --- drivers/i2c/i2c-core.c | 4 ++-- include/linux/i2c.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- linux-2.6.21-rc4.orig/include/linux/i2c.h 2007-03-18 18:19:46.000000000 +0100 +++ linux-2.6.21-rc4/include/linux/i2c.h 2007-03-18 18:34:15.000000000 +0100 @@ -239,7 +239,7 @@ struct i2c_adapter { char name[48]; struct completion dev_released; }; -#define dev_to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) +#define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) static inline void *i2c_get_adapdata (struct i2c_adapter *dev) { --- linux-2.6.21-rc4.orig/drivers/i2c/i2c-core.c 2007-03-18 18:19:46.000000000 +0100 +++ linux-2.6.21-rc4/drivers/i2c/i2c-core.c 2007-03-18 18:34:15.000000000 +0100 @@ -111,14 +111,14 @@ struct bus_type i2c_bus_type = { void i2c_adapter_dev_release(struct device *dev) { - struct i2c_adapter *adap = dev_to_i2c_adapter(dev); + struct i2c_adapter *adap = to_i2c_adapter(dev); complete(&adap->dev_released); } static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf) { - struct i2c_adapter *adap = dev_to_i2c_adapter(dev); + struct i2c_adapter *adap = to_i2c_adapter(dev); return sprintf(buf, "%s\n", adap->name); }