From ef2c8321f5a27ff9ecdae1ee587430cafa495586 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 1 May 2007 23:26:28 +0200
Subject: [PATCH] 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 <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
drivers/i2c/i2c-core.c | 4 ++--
include/linux/i2c.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 1e3e1a5b4d86..ae07b874a5d7 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -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);
}
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 953e71fb07b4..568dd1007b53 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -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)
{
--
2.34.1