i2c: Get rid of remaining bus_id access
authorJean Delvare <khali@linux-fr.org>
Wed, 7 Jan 2009 13:29:16 +0000 (14:29 +0100)
committerJean Delvare <khali@linux-fr.org>
Wed, 7 Jan 2009 13:29:16 +0000 (14:29 +0100)
Use dev_name(dev) instead of accessing dev.bus_id directly, as the
latter is going away soon.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Kay Sievers <kay.sievers@vrfy.org>
drivers/i2c/busses/i2c-pxa.c
drivers/i2c/busses/i2c-s3c2410.c
drivers/i2c/busses/i2c-sh_mobile.c

index 587f5b2380d473677360fb187919ff65358e5bbd..6af68146c34248507c0d8df07691992c31d54991 100644 (file)
@@ -1076,10 +1076,10 @@ static int i2c_pxa_probe(struct platform_device *dev)
 
 #ifdef CONFIG_I2C_PXA_SLAVE
        printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",
-              i2c->adap.dev.bus_id, i2c->slave_addr);
+              dev_name(&i2c->adap.dev), i2c->slave_addr);
 #else
        printk(KERN_INFO "I2C: %s: PXA I2C adapter\n",
-              i2c->adap.dev.bus_id);
+              dev_name(&i2c->adap.dev));
 #endif
        return 0;
 
index f69f91ffb469a6f110227a8f4eee410c6e85501f..5b7f95641ba48119d17fe71c7fc02b8c3b16fd2d 100644 (file)
@@ -906,7 +906,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, i2c);
 
-       dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
+       dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev));
        return 0;
 
  err_cpufreq:
index 6c3d60b939bf20dbe47f8d4b2db13d1cbff68dc5..1c01083b01b5ac0bc3f7eac54a657a72fb049ea0 100644 (file)
@@ -500,7 +500,7 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
        while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
                for (n = res->start; hook && n <= res->end; n++) {
                        if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,
-                                       dev->dev.bus_id, dev))
+                                       dev_name(&dev->dev), dev))
                                goto rollback;
                }
                k++;