Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-s3c2410: Fix build warning
i2c-tiny-usb: Fix truncated adapter name
i2c: Legacy i2c drivers shouldn't issue uevents

Linus Torvalds 19 years ago ad9ddd66 cdb7532f

+6 -4

3 changed files

expand all

drivers

i2c

busses

i2c-s3c2410.c

i2c-tiny-usb.c

i2c-core.c

+2 -1

drivers/i2c/busses/i2c-s3c2410.c

··· 830 830 831 831 i2c->irq = res; 832 832 833 - dev_dbg(&pdev->dev, "irq resource %p (%ld)\n", res, res->start); 833 + dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res, 834 + (unsigned long)res->start); 834 835 835 836 ret = i2c_add_adapter(&i2c->adap); 836 837 if (ret < 0) {

+1 -1

drivers/i2c/busses/i2c-tiny-usb.c

··· 208 208 dev->adapter.class = I2C_CLASS_HWMON; 209 209 dev->adapter.algo = &usb_algorithm; 210 210 dev->adapter.algo_data = dev; 211 - snprintf(dev->adapter.name, I2C_NAME_SIZE, 211 + snprintf(dev->adapter.name, sizeof(dev->adapter.name), 212 212 "i2c-tiny-usb at bus %03d device %03d", 213 213 dev->usb_dev->bus->busnum, dev->usb_dev->devnum); 214 214

+3 -2

drivers/i2c/i2c-core.c

··· 697 697 if (client->driver) 698 698 client->dev.driver = &client->driver->driver; 699 699 700 - if (client->driver && !is_newstyle_driver(client->driver)) 700 + if (client->driver && !is_newstyle_driver(client->driver)) { 701 701 client->dev.release = i2c_client_release; 702 - else 702 + client->dev.uevent_suppress = 1; 703 + } else 703 704 client->dev.release = i2c_client_dev_release; 704 705 705 706 snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),