diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 01:15:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 01:15:14 (GMT) |
| commit | ad9ddd66c6e8a79630a975ff0bb8d45a11abe630 (patch) | |
| tree | bd487aea099fc96a795cb57a8799202fe3b027fa /drivers | |
| parent | cdb7532f7be35c3675b1aed54d10e378014618b6 (diff) | |
| parent | a1ba15832c8f6ac2d5d193a6dbb91bcf7705b732 (diff) | |
| download | linux-ad9ddd66c6e8a79630a975ff0bb8d45a11abe630.tar.xz | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* '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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 3 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-tiny-usb.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-core.c | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index e68a96f..e4540fc 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -830,7 +830,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) i2c->irq = res; - dev_dbg(&pdev->dev, "irq resource %p (%ld)\n", res, res->start); + dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res, + (unsigned long)res->start); ret = i2c_add_adapter(&i2c->adap); if (ret < 0) { diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c index 9079990..cb9abe7 100644 --- a/drivers/i2c/busses/i2c-tiny-usb.c +++ b/drivers/i2c/busses/i2c-tiny-usb.c @@ -208,7 +208,7 @@ static int i2c_tiny_usb_probe(struct usb_interface *interface, dev->adapter.class = I2C_CLASS_HWMON; dev->adapter.algo = &usb_algorithm; dev->adapter.algo_data = dev; - snprintf(dev->adapter.name, I2C_NAME_SIZE, + snprintf(dev->adapter.name, sizeof(dev->adapter.name), "i2c-tiny-usb at bus %03d device %03d", dev->usb_dev->bus->busnum, dev->usb_dev->devnum); diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 64f8e56..435925e 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -697,9 +697,10 @@ int i2c_attach_client(struct i2c_client *client) if (client->driver) client->dev.driver = &client->driver->driver; - if (client->driver && !is_newstyle_driver(client->driver)) + if (client->driver && !is_newstyle_driver(client->driver)) { client->dev.release = i2c_client_release; - else + client->dev.uevent_suppress = 1; + } else client->dev.release = i2c_client_dev_release; snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id), |