1 files changed, 23 insertions, 22 deletions

diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 1af3dfbb8086..179b1e022d80 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -32,6 +32,7 @@
 #include <linux/suspend.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
+#include <linux/mutex.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
@@ -81,7 +82,7 @@ enum tps_model {
 
 struct tps65010 {
         struct i2c_client       client;
-        struct semaphore        lock;
+        struct mutex            lock;
         int                     irq;
         struct work_struct      work;
         struct dentry           *file;
@@ -218,7 +219,7 @@ static int dbg_show(struct seq_file *s, void *_)
         seq_printf(s, "driver  %s\nversion %s\nchip    %s\n\n",
                         DRIVER_NAME, DRIVER_VERSION, chip);
 
-        down(&tps->lock);
+        mutex_lock(&tps->lock);
 
         /* FIXME how can we tell whether a battery is present?
          * likely involves a charge gauging chip (like BQ26501).
@@ -300,7 +301,7 @@ static int dbg_show(struct seq_file *s, void *_)
                                 (v2 & (1 << (4 + i))) ? "rising" : "falling");
         }
 
-        up(&tps->lock);
+        mutex_unlock(&tps->lock);
         return 0;
 }
 
@@ -416,7 +417,7 @@ static void tps65010_work(void *_tps)
 {
         struct tps65010         *tps = _tps;
 
-        down(&tps->lock);
+        mutex_lock(&tps->lock);
 
         tps65010_interrupt(tps);
 
@@ -444,7 +445,7 @@ static void tps65010_work(void *_tps)
         if (test_and_clear_bit(FLAG_IRQ_ENABLE, &tps->flags))
                 enable_irq(tps->irq);
 
-        up(&tps->lock);
+        mutex_unlock(&tps->lock);
 }
 
 static irqreturn_t tps65010_irq(int irq, void *_tps, struct pt_regs *regs)
@@ -505,7 +506,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
         if (!tps)
                 return 0;
 
-        init_MUTEX(&tps->lock);
+        mutex_init(&tps->lock);
         INIT_WORK(&tps->work, tps65010_work, tps);
         tps->irq = -1;
         tps->client.addr = address;
@@ -695,7 +696,7 @@ int tps65010_set_gpio_out_value(unsigned gpio, unsigned value)
         if ((gpio < GPIO1) || (gpio > GPIO4))
                 return -EINVAL;
 
-        down(&the_tps->lock);
+        mutex_lock(&the_tps->lock);
 
         defgpio = i2c_smbus_read_byte_data(&the_tps->client, TPS_DEFGPIO);
 
@@ -720,7 +721,7 @@ int tps65010_set_gpio_out_value(unsigned gpio, unsigned value)
                 gpio, value ? "high" : "low",
                 i2c_smbus_read_byte_data(&the_tps->client, TPS_DEFGPIO));
 
-        up(&the_tps->lock);
+        mutex_unlock(&the_tps->lock);
         return status;
 }
 EXPORT_SYMBOL(tps65010_set_gpio_out_value);
@@ -745,7 +746,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
                 led = LED2;
         }
 
-        down(&the_tps->lock);
+        mutex_lock(&the_tps->lock);
 
         pr_debug("%s: led%i_on   0x%02x\n", DRIVER_NAME, led,
                 i2c_smbus_read_byte_data(&the_tps->client,
@@ -771,7 +772,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
         default:
                 printk(KERN_ERR "%s: Wrong mode parameter for set_led()\n",
                        DRIVER_NAME);
-                up(&the_tps->lock);
+                mutex_unlock(&the_tps->lock);
                 return -EINVAL;
         }
 
@@ -781,7 +782,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
         if (status != 0) {
                 printk(KERN_ERR "%s: Failed to write led%i_on register\n",
                        DRIVER_NAME, led);
-                up(&the_tps->lock);
+                mutex_unlock(&the_tps->lock);
                 return status;
         }
 
@@ -794,7 +795,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
         if (status != 0) {
                 printk(KERN_ERR "%s: Failed to write led%i_per register\n",
                        DRIVER_NAME, led);
-                up(&the_tps->lock);
+                mutex_unlock(&the_tps->lock);
                 return status;
         }
 
@@ -802,7 +803,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
                 i2c_smbus_read_byte_data(&the_tps->client,
                                 TPS_LED1_PER + offs));
 
-        up(&the_tps->lock);
+        mutex_unlock(&the_tps->lock);
 
         return status;
 }
@@ -820,7 +821,7 @@ int tps65010_set_vib(unsigned value)
         if (!the_tps)
                 return -ENODEV;
 
-        down(&the_tps->lock);
+        mutex_lock(&the_tps->lock);
 
         vdcdc2 = i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC2);
         vdcdc2 &= ~(1 << 1);
@@ -831,7 +832,7 @@ int tps65010_set_vib(unsigned value)
 
         pr_debug("%s: vibrator %s\n", DRIVER_NAME, value ? "on" : "off");
 
-        up(&the_tps->lock);
+        mutex_unlock(&the_tps->lock);
         return status;
 }
 EXPORT_SYMBOL(tps65010_set_vib);
@@ -848,7 +849,7 @@ int tps65010_set_low_pwr(unsigned mode)
         if (!the_tps)
                 return -ENODEV;
 
-        down(&the_tps->lock);
+        mutex_lock(&the_tps->lock);
 
         pr_debug("%s: %s low_pwr, vdcdc1 0x%02x\n", DRIVER_NAME,
                 mode ? "enable" : "disable",
@@ -876,7 +877,7 @@ int tps65010_set_low_pwr(unsigned mode)
                 pr_debug("%s: vdcdc1 0x%02x\n", DRIVER_NAME,
                         i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
 
-        up(&the_tps->lock);
+        mutex_unlock(&the_tps->lock);
 
         return status;
 }
@@ -894,7 +895,7 @@ int tps65010_config_vregs1(unsigned value)
         if (!the_tps)
                 return -ENODEV;
 
-        down(&the_tps->lock);
+        mutex_lock(&the_tps->lock);
 
         pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
                         i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
@@ -909,7 +910,7 @@ int tps65010_config_vregs1(unsigned value)
                 pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
                         i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
 
-        up(&the_tps->lock);
+        mutex_unlock(&the_tps->lock);
 
         return status;
 }
@@ -931,7 +932,7 @@ int tps65013_set_low_pwr(unsigned mode)
         if (!the_tps || the_tps->por)
                 return -ENODEV;
 
-        down(&the_tps->lock);
+        mutex_lock(&the_tps->lock);
 
         pr_debug("%s: %s low_pwr, chgconfig 0x%02x vdcdc1 0x%02x\n",
                 DRIVER_NAME,
@@ -959,7 +960,7 @@ int tps65013_set_low_pwr(unsigned mode)
         if (status != 0) {
                 printk(KERN_ERR "%s: Failed to write chconfig register\n",
          DRIVER_NAME);
-                up(&the_tps->lock);
+                mutex_unlock(&the_tps->lock);
                 return status;
         }
 
@@ -977,7 +978,7 @@ int tps65013_set_low_pwr(unsigned mode)
                 pr_debug("%s: vdcdc1 0x%02x\n", DRIVER_NAME,
                         i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
 
-        up(&the_tps->lock);
+        mutex_unlock(&the_tps->lock);
 
         return status;
 }