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>
This commit is contained in:
parent
8de577095d
commit
4bfe66048e
1 changed files with 6 additions and 5 deletions
|
@ -31,14 +31,15 @@
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/sysfs.h>
|
#include <linux/sysfs.h>
|
||||||
#include <linux/hwmon.h>
|
#include <linux/hwmon.h>
|
||||||
|
#include <linux/mutex.h>
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
#include <asm/semaphore.h>
|
|
||||||
|
|
||||||
#define DRVNAME "lm70"
|
#define DRVNAME "lm70"
|
||||||
|
|
||||||
struct lm70 {
|
struct lm70 {
|
||||||
struct device *hwmon_dev;
|
struct device *hwmon_dev;
|
||||||
struct semaphore sem;
|
struct mutex lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* sysfs hook function */
|
/* sysfs hook function */
|
||||||
|
@ -51,7 +52,7 @@ static ssize_t lm70_sense_temp(struct device *dev,
|
||||||
s16 raw=0;
|
s16 raw=0;
|
||||||
struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
|
struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
|
||||||
|
|
||||||
if (down_interruptible(&p_lm70->sem))
|
if (mutex_lock_interruptible(&p_lm70->lock))
|
||||||
return -ERESTARTSYS;
|
return -ERESTARTSYS;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -83,7 +84,7 @@ static ssize_t lm70_sense_temp(struct device *dev,
|
||||||
val = ((int)raw/32) * 250;
|
val = ((int)raw/32) * 250;
|
||||||
status = sprintf(buf, "%d\n", val); /* millidegrees Celsius */
|
status = sprintf(buf, "%d\n", val); /* millidegrees Celsius */
|
||||||
out:
|
out:
|
||||||
up(&p_lm70->sem);
|
mutex_unlock(&p_lm70->lock);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,7 +113,7 @@ static int __devinit lm70_probe(struct spi_device *spi)
|
||||||
if (!p_lm70)
|
if (!p_lm70)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
init_MUTEX(&p_lm70->sem);
|
mutex_init(&p_lm70->lock);
|
||||||
|
|
||||||
/* sysfs hook */
|
/* sysfs hook */
|
||||||
p_lm70->hwmon_dev = hwmon_device_register(&spi->dev);
|
p_lm70->hwmon_dev = hwmon_device_register(&spi->dev);
|
||||||
|
|
Loading…
Reference in a new issue