[i2c] [PATCH 3/6] i2c: Stop using i2c_adapter.class_dev

Jean Delvare khali at linux-fr.org
Sat Feb 10 17:16:24 CET 2007


Stop using i2c_adapter.class_dev, as it is going to be removed
soon. Luckily, there are only 4 RTC drivers affected.

Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 drivers/rtc/rtc-ds1672.c  |    2 +-
 drivers/rtc/rtc-pcf8563.c |    2 +-
 drivers/rtc/rtc-rs5c372.c |    2 +-
 drivers/rtc/rtc-x1205.c   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- linux-2.6.21-pre.orig/drivers/rtc/rtc-ds1672.c	2007-02-10 10:34:15.000000000 +0100
+++ linux-2.6.21-pre/drivers/rtc/rtc-ds1672.c	2007-02-10 12:34:45.000000000 +0100
@@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapt
 	struct i2c_client *client;
 	struct rtc_device *rtc;
 
-	dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
+	dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
 		err = -ENODEV;
--- linux-2.6.21-pre.orig/drivers/rtc/rtc-pcf8563.c	2007-02-10 10:35:14.000000000 +0100
+++ linux-2.6.21-pre/drivers/rtc/rtc-pcf8563.c	2007-02-10 12:34:45.000000000 +0100
@@ -279,7 +279,7 @@ static int pcf8563_probe(struct i2c_adap
 
 	int err = 0;
 
-	dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
+	dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
 		err = -ENODEV;
--- linux-2.6.21-pre.orig/drivers/rtc/rtc-rs5c372.c	2007-02-10 10:34:15.000000000 +0100
+++ linux-2.6.21-pre/drivers/rtc/rtc-rs5c372.c	2007-02-10 12:34:45.000000000 +0100
@@ -499,7 +499,7 @@ static int rs5c372_probe(struct i2c_adap
 	struct rs5c372 *rs5c372;
 	struct rtc_time tm;
 
-	dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
+	dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
 		err = -ENODEV;
--- linux-2.6.21-pre.orig/drivers/rtc/rtc-x1205.c	2007-02-10 10:34:15.000000000 +0100
+++ linux-2.6.21-pre/drivers/rtc/rtc-x1205.c	2007-02-10 12:34:45.000000000 +0100
@@ -506,7 +506,7 @@ static int x1205_probe(struct i2c_adapte
 	struct i2c_client *client;
 	struct rtc_device *rtc;
 
-	dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
+	dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
 		err = -ENODEV;

-- 
Jean Delvare



More information about the i2c mailing list