[i2c] [patch 2.6.20-rc1 4/6] other drivers (mostly media) stop using i2c_adapter.dev

[David Brownell]

This updates other I2C drivers that live outside drivers/i2c to
stop using i2c_adapter.dev, using i2c_adapter.class_dev instead.
This is mostly diagnostics, but a few changes relate to firmware
loading instead.

Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
---
 drivers/media/dvb/frontends/nxt200x.c          |   12 ++++++++----
 drivers/media/dvb/frontends/or51132.c          |    2 +-
 drivers/media/video/cx25840/cx25840-firmware.c |    2 +-
 drivers/media/video/ir-kbd-i2c.c               |    2 +-
 drivers/video/fb_ddc.c                         |    6 +++---
 drivers/w1/masters/ds2482.c                    |    6 ++++--
 6 files changed, 18 insertions(+), 12 deletions(-)

Index: g26/drivers/w1/masters/ds2482.c
===================================================================
--- g26.orig/drivers/w1/masters/ds2482.c	2006-12-16 15:51:12.000000000 -0800
+++ g26/drivers/w1/masters/ds2482.c	2006-12-16 15:52:17.000000000 -0800
@@ -454,7 +454,8 @@ static int ds2482_detect(struct i2c_adap
 
 	/* Reset the device (sets the read_ptr to status) */
 	if (ds2482_send_cmd(data, DS2482_CMD_RESET) < 0) {
-		dev_dbg(&adapter->dev, "DS2482 reset failed at 0x%02x.\n",
+		dev_dbg(adapter->class_dev.dev,
+			"DS2482 reset failed at 0x%02x.\n",
 			address);
 		goto exit_free;
 	}
@@ -465,7 +466,8 @@ static int ds2482_detect(struct i2c_adap
 	/* Read the status byte - only reset bit and line should be set */
 	temp1 = i2c_smbus_read_byte(new_client);
 	if (temp1 != (DS2482_REG_STS_LL | DS2482_REG_STS_RST)) {
-		dev_dbg(&adapter->dev, "DS2482 (0x%02x) reset status "
+		dev_dbg(adapter->class_dev.dev,
+			"DS2482 (0x%02x) reset status "
 			"0x%02X - not a DS2482\n", address, temp1);
 		goto exit_free;
 	}
Index: g26/drivers/video/fb_ddc.c
===================================================================
--- g26.orig/drivers/video/fb_ddc.c	2006-12-16 15:51:12.000000000 -0800
+++ g26/drivers/video/fb_ddc.c	2006-12-16 15:52:17.000000000 -0800
@@ -36,15 +36,15 @@ static unsigned char *fb_do_probe_ddc_ed
 	};
 
 	if (!buf) {
-		dev_warn(&adapter->dev, "unable to allocate memory for EDID "
-			 "block.\n");
+		dev_warn(adapter->class_dev.dev,
+			"unable to allocate memory for EDID block.\n");
 		return NULL;
 	}
 
 	if (i2c_transfer(adapter, msgs, 2) == 2)
 		return buf;
 
-	dev_warn(&adapter->dev, "unable to read EDID block.\n");
+	dev_warn(adapter->class_dev.dev, "unable to read EDID block.\n");
 	kfree(buf);
 	return NULL;
 }
Index: g26/drivers/media/dvb/frontends/nxt200x.c
===================================================================
--- g26.orig/drivers/media/dvb/frontends/nxt200x.c	2006-12-16 15:51:12.000000000 -0800
+++ g26/drivers/media/dvb/frontends/nxt200x.c	2006-12-16 15:52:17.000000000 -0800
@@ -887,8 +887,10 @@ static int nxt2002_init(struct dvb_front
 	u8 buf[2];
 
 	/* request the firmware, this will block until someone uploads it */
-	printk("nxt2002: Waiting for firmware upload (%s)...\n", NXT2002_DEFAULT_FIRMWARE);
-	ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE, &state->i2c->dev);
+	printk("nxt2002: Waiting for firmware upload (%s)...\n",
+			NXT2002_DEFAULT_FIRMWARE);
+	ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE,
+			state->i2c->class_dev.dev);
 	printk("nxt2002: Waiting for firmware upload(2)...\n");
 	if (ret) {
 		printk("nxt2002: No firmware uploaded (timeout or file not found?)\n");
@@ -951,8 +953,10 @@ static int nxt2004_init(struct dvb_front
 	nxt200x_writebytes(state, 0x1E, buf, 1);
 
 	/* request the firmware, this will block until someone uploads it */
-	printk("nxt2004: Waiting for firmware upload (%s)...\n", NXT2004_DEFAULT_FIRMWARE);
-	ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE, &state->i2c->dev);
+	printk("nxt2004: Waiting for firmware upload (%s)...\n",
+			NXT2004_DEFAULT_FIRMWARE);
+	ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE,
+			state->i2c->class_dev.dev);
 	printk("nxt2004: Waiting for firmware upload(2)...\n");
 	if (ret) {
 		printk("nxt2004: No firmware uploaded (timeout or file not found?)\n");
Index: g26/drivers/media/dvb/frontends/or51132.c
===================================================================
--- g26.orig/drivers/media/dvb/frontends/or51132.c	2006-12-16 15:51:12.000000000 -0800
+++ g26/drivers/media/dvb/frontends/or51132.c	2006-12-16 15:52:17.000000000 -0800
@@ -362,7 +362,7 @@ static int or51132_set_parameters(struct
 		}
 		printk("or51132: Waiting for firmware upload(%s)...\n",
 		       fwname);
-		ret = request_firmware(&fw, fwname, &state->i2c->dev);
+		ret = request_firmware(&fw, fwname, state->i2c->class_dev.dev);
 		if (ret) {
 			printk(KERN_WARNING "or51132: No firmware up"
 			       "loaded(timeout or file not found?)\n");
Index: g26/drivers/media/video/cx25840/cx25840-firmware.c
===================================================================
--- g26.orig/drivers/media/video/cx25840/cx25840-firmware.c	2006-12-16 15:51:12.000000000 -0800
+++ g26/drivers/media/video/cx25840/cx25840-firmware.c	2006-12-16 15:52:17.000000000 -0800
@@ -37,7 +37,7 @@
  */
 #define FWSEND 48
 
-#define FWDEV(x) &((x)->adapter->dev)
+#define FWDEV(x) ((x)->adapter->class_dev.dev)
 
 static char *firmware = FWFILE;
 
Index: g26/drivers/media/video/ir-kbd-i2c.c
===================================================================
--- g26.orig/drivers/media/video/ir-kbd-i2c.c	2006-12-16 15:51:12.000000000 -0800
+++ g26/drivers/media/video/ir-kbd-i2c.c	2006-12-16 15:52:17.000000000 -0800
@@ -386,7 +386,7 @@ static int ir_attach(struct i2c_adapter 
 
 	/* Phys addr can only be set after attaching (for ir->c.dev.bus_id) */
 	snprintf(ir->phys, sizeof(ir->phys), "%s/%s/ir0",
-		 ir->c.adapter->dev.bus_id,
+		 ir->c.adapter->class_dev.class_id,
 		 ir->c.dev.bus_id);
 
 	/* init + register input device */