diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-16 17:28:56 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-05 17:20:35 +1100 |
| commit | 710dc171d4bc8c615bfe5d5202faac6bb3927981 (patch) | |
| tree | c002e240b61f68e8c290eb2d0cf1e1e994137329 | |
| parent | eef59afcb4e28ee5f266d2d2717419b12f2d6aa3 (diff) | |
i2c: update for semaphore to mutex conversion of devices
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | drivers/i2c/i2c-smbus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index 421278221243..9864b3e323d2 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c @@ -27,6 +27,7 @@ #include <linux/workqueue.h> #include <linux/i2c.h> #include <linux/i2c-smbus.h> +#include <linux/mutex.h> struct i2c_smbus_alert { unsigned int alert_edge_triggered:1; @@ -55,7 +56,7 @@ static int smbus_do_alert(struct device *dev, void *addrp) * Drivers should either disable alerts, or provide at least * a minimal handler. Lock so client->driver won't change. */ - down(&dev->sem); + device_lock(dev); if (client->driver) { if (client->driver->alert) client->driver->alert(client, data->flag); @@ -63,7 +64,7 @@ static int smbus_do_alert(struct device *dev, void *addrp) dev_warn(&client->dev, "no driver alert()!\n"); } else dev_dbg(&client->dev, "alert with no driver\n"); - up(&dev->sem); + device_unlock(dev); /* Stop iterating after we find the device */ return -EBUSY; |