[PATCH] hwmon: Semaphore to mutex conversions
convert drivers/hwmon/*.c semaphore use to mutexes. the conversion was generated via scripts, and the result was validated automatically via a script as well. all affected hwmon drivers were build-tested. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
3fb9a65529
commit
9a61bf6300
@@ -26,6 +26,7 @@
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/hwmon.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
|
||||
/* Addresses to scan */
|
||||
@@ -92,7 +93,7 @@ struct adm1021_data {
|
||||
struct class_device *class_dev;
|
||||
enum chips type;
|
||||
|
||||
struct semaphore update_lock;
|
||||
struct mutex update_lock;
|
||||
char valid; /* !=0 if following fields are valid */
|
||||
unsigned long last_updated; /* In jiffies */
|
||||
|
||||
@@ -162,10 +163,10 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
|
||||
struct adm1021_data *data = i2c_get_clientdata(client); \
|
||||
int temp = simple_strtoul(buf, NULL, 10); \
|
||||
\
|
||||
down(&data->update_lock); \
|
||||
mutex_lock(&data->update_lock); \
|
||||
data->value = TEMP_TO_REG(temp); \
|
||||
adm1021_write_value(client, reg, data->value); \
|
||||
up(&data->update_lock); \
|
||||
mutex_unlock(&data->update_lock); \
|
||||
return count; \
|
||||
}
|
||||
set(temp_max, ADM1021_REG_TOS_W);
|
||||
@@ -275,7 +276,7 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
|
||||
strlcpy(new_client->name, type_name, I2C_NAME_SIZE);
|
||||
data->type = kind;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
mutex_init(&data->update_lock);
|
||||
|
||||
/* Tell the I2C layer a new client has arrived */
|
||||
if ((err = i2c_attach_client(new_client)))
|
||||
@@ -351,7 +352,7 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct adm1021_data *data = i2c_get_clientdata(client);
|
||||
|
||||
down(&data->update_lock);
|
||||
mutex_lock(&data->update_lock);
|
||||
|
||||
if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|
||||
|| !data->valid) {
|
||||
@@ -375,7 +376,7 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
|
||||
data->valid = 1;
|
||||
}
|
||||
|
||||
up(&data->update_lock);
|
||||
mutex_unlock(&data->update_lock);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
Reference in New Issue
Block a user