[i2c] [patch 2.6.21-rc3-git + i2c] rename dev_to_i2c_adapter()

[David Brownell]

This patch renames 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 <dbrownell at users.sourceforge.net>

---
 drivers/i2c/busses/i2c-isa.c |    2 +-
 drivers/i2c/i2c-core.c       |    4 ++--
 include/linux/i2c.h          |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Index: at91/include/linux/i2c.h
===================================================================
--- at91.orig/include/linux/i2c.h	2007-03-08 11:36:05.000000000 -0800
+++ at91/include/linux/i2c.h	2007-03-08 11:36:19.000000000 -0800
@@ -239,7 +239,7 @@ struct i2c_adapter {
 	char name[50];
 	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)
 {
Index: at91/drivers/i2c/i2c-core.c
===================================================================
--- at91.orig/drivers/i2c/i2c-core.c	2007-03-08 11:36:05.000000000 -0800
+++ at91/drivers/i2c/i2c-core.c	2007-03-08 11:36:19.000000000 -0800
@@ -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);
 }
 
Index: at91/drivers/i2c/busses/i2c-isa.c
===================================================================
--- at91.orig/drivers/i2c/busses/i2c-isa.c	2007-03-08 11:34:52.000000000 -0800
+++ at91/drivers/i2c/busses/i2c-isa.c	2007-03-08 11:36:19.000000000 -0800
@@ -68,7 +68,7 @@ static u32 isa_func(struct i2c_adapter *
 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);
 }
 static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);