Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22e965c2 authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c: Get rid of remaining bus_id access 



Use dev_name(dev) instead of accessing dev.bus_id directly, as the
latter is going away soon.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Kay Sievers <kay.sievers@vrfy.org>
parent 27d9c183

drivers/i2c/busses/i2c-pxa.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1076,10 +1076,10 @@ static int i2c_pxa_probe(struct platform_device *dev) 




#ifdef CONFIG_I2C_PXA_SLAVE

#ifdef CONFIG_I2C_PXA_SLAVE

	printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",

	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

#else

	printk(KERN_INFO "I2C: %s: PXA I2C adapter\n",

	printk(KERN_INFO "I2C: %s: PXA I2C adapter\n",

	       i2c->adap.dev.bus_id);

	       dev_name(&i2c->adap.dev));

#endif

#endif

	return 0;

	return 0;

drivers/i2c/busses/i2c-s3c2410.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -906,7 +906,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 




	platform_set_drvdata(pdev, i2c);

	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;

	return 0;





 err_cpufreq:

 err_cpufreq:

drivers/i2c/busses/i2c-sh_mobile.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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))) {

	while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {

		for (n = res->start; hook && n <= res->end; n++) {

		for (n = res->start; hook && n <= res->end; n++) {

			if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,

			if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,

					dev->dev.bus_id, dev))

					dev_name(&dev->dev), dev))

				goto rollback;

				goto rollback;

		}

		}

		k++;

		k++;