Skip to content

Commit

Permalink
hwmon: (lm70) Convert semaphore to mutex
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthias Kaehlcke authored and Mark M. Hoffman committed Nov 8, 2007
1 parent 8de5770 commit 4bfe660
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/hwmon/lm70.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;

/*
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4bfe660

Please sign in to comment.