diff options
| author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-10-24 14:59:09 +0200 |
|---|---|---|
| committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2007-11-08 14:42:46 +0100 |
| commit | 4bfe66048e97d29ab229519e9a821dbd4d929bd9 (patch) | |
| tree | 895466bc1b959880d6e642a1abae3db290e73de7 /drivers | |
| parent | hwmon: (applesmc) Add support for Mac Pro 2 x Quad-Core (diff) | |
| download | linux-4bfe66048e97d29ab229519e9a821dbd4d929bd9.tar.xz linux-4bfe66048e97d29ab229519e9a821dbd4d929bd9.zip | |
hwmon: (lm70) Convert semaphore to mutex
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/lm70.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c index dd366889ce9b..d435f003292d 100644 --- a/drivers/hwmon/lm70.c +++ b/drivers/hwmon/lm70.c @@ -31,14 +31,15 @@ #include <linux/err.h> #include <linux/sysfs.h> #include <linux/hwmon.h> +#include <linux/mutex.h> #include <linux/spi/spi.h> -#include <asm/semaphore.h> + #define DRVNAME "lm70" struct lm70 { struct device *hwmon_dev; - struct semaphore sem; + struct mutex lock; }; /* sysfs hook function */ @@ -51,7 +52,7 @@ static ssize_t lm70_sense_temp(struct device *dev, s16 raw=0; struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev); - if (down_interruptible(&p_lm70->sem)) + if (mutex_lock_interruptible(&p_lm70->lock)) return -ERESTARTSYS; /* @@ -83,7 +84,7 @@ static ssize_t lm70_sense_temp(struct device *dev, val = ((int)raw/32) * 250; status = sprintf(buf, "%d\n", val); /* millidegrees Celsius */ out: - up(&p_lm70->sem); + mutex_unlock(&p_lm70->lock); return status; } @@ -112,7 +113,7 @@ static int __devinit lm70_probe(struct spi_device *spi) if (!p_lm70) return -ENOMEM; - init_MUTEX(&p_lm70->sem); + mutex_init(&p_lm70->lock); /* sysfs hook */ p_lm70->hwmon_dev = hwmon_device_register(&spi->dev); |