From: David Brownell Subject: i2c: Other drivers stop using i2c_adapter.dev This updates other I2C drivers that live outside drivers/i2c to stop using i2c_adapter.dev, using i2c_adapter.class_dev.dev instead. This is mostly diagnostics, but a few changes relate to firmware loading instead. Signed-off-by: David Brownell Signed-off-by: Jean Delvare --- drivers/media/dvb/frontends/nxt200x.c | 6 ++++-- 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, 14 insertions(+), 10 deletions(-) --- linux-2.6.20-rc3.orig/drivers/media/dvb/frontends/nxt200x.c 2007-01-04 16:30:14.000000000 +0100 +++ linux-2.6.20-rc3/drivers/media/dvb/frontends/nxt200x.c 2007-01-04 16:30:27.000000000 +0100 @@ -888,7 +888,8 @@ static int nxt2002_init(struct dvb_front /* 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); + 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"); @@ -952,7 +953,8 @@ static int nxt2004_init(struct dvb_front /* 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); + 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"); --- linux-2.6.20-rc3.orig/drivers/media/dvb/frontends/or51132.c 2007-01-04 16:30:14.000000000 +0100 +++ linux-2.6.20-rc3/drivers/media/dvb/frontends/or51132.c 2007-01-04 16:30:27.000000000 +0100 @@ -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"); --- linux-2.6.20-rc3.orig/drivers/media/video/cx25840/cx25840-firmware.c 2007-01-04 16:30:14.000000000 +0100 +++ linux-2.6.20-rc3/drivers/media/video/cx25840/cx25840-firmware.c 2007-01-04 16:30:27.000000000 +0100 @@ -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; --- linux-2.6.20-rc3.orig/drivers/media/video/ir-kbd-i2c.c 2007-01-04 16:30:14.000000000 +0100 +++ linux-2.6.20-rc3/drivers/media/video/ir-kbd-i2c.c 2007-01-04 16:30:27.000000000 +0100 @@ -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 */ --- linux-2.6.20-rc3.orig/drivers/video/fb_ddc.c 2007-01-04 16:30:14.000000000 +0100 +++ linux-2.6.20-rc3/drivers/video/fb_ddc.c 2007-01-04 16:30:27.000000000 +0100 @@ -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; } --- linux-2.6.20-rc3.orig/drivers/w1/masters/ds2482.c 2007-01-04 16:30:14.000000000 +0100 +++ linux-2.6.20-rc3/drivers/w1/masters/ds2482.c 2007-01-04 16:30:27.000000000 +0100 @@ -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; }