Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a61bf63 authored by Ingo Molnar's avatar Ingo Molnar Committed by Greg Kroah-Hartman
Browse files

[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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3fb9a655

drivers/hwmon/adm1021.c

+7 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/hwmon/adm1025.c

+13 −12
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/hwmon.h>

#include <linux/hwmon-vid.h>

#include <linux/err.h>

#include <linux/mutex.h>



/*

 * Addresses to scan
@@ -133,7 +134,7 @@ static struct i2c_driver adm1025_driver = { 
struct adm1025_data {

	struct i2c_client client;

	struct class_device *class_dev;

	struct semaphore update_lock;

	struct mutex update_lock;

	char valid; /* zero until following fields are valid */

	unsigned long last_updated; /* in jiffies */
@@ -207,11 +208,11 @@ static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute 
	struct adm1025_data *data = i2c_get_clientdata(client); \

	long val = simple_strtol(buf, NULL, 10); \

 \

	down(&data->update_lock); \

	mutex_lock(&data->update_lock); \

	data->in_min[offset] = IN_TO_REG(val, in_scale[offset]); \

	i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MIN(offset), \

				  data->in_min[offset]); \

	up(&data->update_lock); \

	mutex_unlock(&data->update_lock); \

	return count; \

} \

static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
@@ -221,11 +222,11 @@ static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute 
	struct adm1025_data *data = i2c_get_clientdata(client); \

	long val = simple_strtol(buf, NULL, 10); \

 \

	down(&data->update_lock); \

	mutex_lock(&data->update_lock); \

	data->in_max[offset] = IN_TO_REG(val, in_scale[offset]); \

	i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MAX(offset), \

				  data->in_max[offset]); \

	up(&data->update_lock); \

	mutex_unlock(&data->update_lock); \

	return count; \

} \

static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
@@ -247,11 +248,11 @@ static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribut 
	struct adm1025_data *data = i2c_get_clientdata(client); \

	long val = simple_strtol(buf, NULL, 10); \

 \

	down(&data->update_lock); \

	mutex_lock(&data->update_lock); \

	data->temp_min[offset-1] = TEMP_TO_REG(val); \

	i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_LOW(offset-1), \

				  data->temp_min[offset-1]); \

	up(&data->update_lock); \

	mutex_unlock(&data->update_lock); \

	return count; \

} \

static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
@@ -261,11 +262,11 @@ static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribut 
	struct adm1025_data *data = i2c_get_clientdata(client); \

	long val = simple_strtol(buf, NULL, 10); \

 \

	down(&data->update_lock); \

	mutex_lock(&data->update_lock); \

	data->temp_max[offset-1] = TEMP_TO_REG(val); \

	i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_HIGH(offset-1), \

				  data->temp_max[offset-1]); \

	up(&data->update_lock); \

	mutex_unlock(&data->update_lock); \

	return count; \

} \

static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
@@ -404,7 +405,7 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind) 
	/* We can fill in the remaining client fields */

	strlcpy(new_client->name, name, I2C_NAME_SIZE);

	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)))
@@ -523,7 +524,7 @@ static struct adm1025_data *adm1025_update_device(struct device *dev) 
	struct i2c_client *client = to_i2c_client(dev);

	struct adm1025_data *data = i2c_get_clientdata(client);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);



	if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {

		int i;
@@ -558,7 +559,7 @@ static struct adm1025_data *adm1025_update_device(struct device *dev) 
		data->valid = 1;

	}



	up(&data->update_lock);

	mutex_unlock(&data->update_lock);



	return data;

}

drivers/hwmon/adm1026.c

+44 −43
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/hwmon-sysfs.h>

#include <linux/hwmon-vid.h>

#include <linux/err.h>

#include <linux/mutex.h>



/* Addresses to scan */

static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
@@ -260,10 +261,10 @@ struct pwm_data { 
struct adm1026_data {

	struct i2c_client client;

	struct class_device *class_dev;

	struct semaphore lock;

	struct mutex lock;

	enum chips type;



	struct semaphore update_lock;

	struct mutex update_lock;

	int valid;		/* !=0 if following fields are valid */

	unsigned long last_reading;	/* In jiffies */

	unsigned long last_config;	/* In jiffies */
@@ -575,7 +576,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) 
	int i;

	long value, alarms, gpio;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	if (!data->valid

	    || time_after(jiffies, data->last_reading + ADM1026_DATA_INTERVAL)) {

		/* Things that change quickly */
@@ -710,7 +711,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) 
	dev_dbg(&client->dev, "Setting VID from GPIO11-15.\n");

	data->vid = (data->gpio >> 11) & 0x1f;

	data->valid = 1;

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return data;

}
@@ -739,10 +740,10 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->in_min[nr] = INS_TO_REG(nr, val);

	adm1026_write_value(client, ADM1026_REG_IN_MIN[nr], data->in_min[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count; 

}

static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
@@ -762,10 +763,10 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->in_max[nr] = INS_TO_REG(nr, val);

	adm1026_write_value(client, ADM1026_REG_IN_MAX[nr], data->in_max[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -813,10 +814,10 @@ static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, c 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->in_min[16] = INS_TO_REG(16, val + NEG12_OFFSET);

	adm1026_write_value(client, ADM1026_REG_IN_MIN[16], data->in_min[16]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count; 

}

static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr, char *buf)
@@ -831,10 +832,10 @@ static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr, c 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->in_max[16] = INS_TO_REG(16, val+NEG12_OFFSET);

	adm1026_write_value(client, ADM1026_REG_IN_MAX[16], data->in_max[16]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -874,11 +875,11 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->fan_min[nr] = FAN_TO_REG(val, data->fan_div[nr]);

	adm1026_write_value(client, ADM1026_REG_FAN_MIN(nr),

		data->fan_min[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -939,7 +940,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, 
	if (new_div == 0) {

		return -EINVAL;

	}

	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	orig_div = data->fan_div[nr];

	data->fan_div[nr] = DIV_FROM_REG(new_div);
@@ -958,7 +959,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, 
	if (data->fan_div[nr] != orig_div) {

		fixup_fan_min(dev,nr,orig_div);

	}

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1001,11 +1002,11 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_min[nr] = TEMP_TO_REG(val);

	adm1026_write_value(client, ADM1026_REG_TEMP_MIN[nr],

		data->temp_min[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
@@ -1025,11 +1026,11 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_max[nr] = TEMP_TO_REG(val);

	adm1026_write_value(client, ADM1026_REG_TEMP_MAX[nr],

		data->temp_max[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1064,11 +1065,11 @@ static ssize_t set_temp_offset(struct device *dev, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_offset[nr] = TEMP_TO_REG(val);

	adm1026_write_value(client, ADM1026_REG_TEMP_OFFSET[nr],

		data->temp_offset[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1115,11 +1116,11 @@ static ssize_t set_temp_auto_point1_temp(struct device *dev, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_tmin[nr] = TEMP_TO_REG(val);

	adm1026_write_value(client, ADM1026_REG_TEMP_TMIN[nr],

		data->temp_tmin[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1150,11 +1151,11 @@ static ssize_t set_temp_crit_enable(struct device *dev, 
	int val = simple_strtol(buf, NULL, 10);



	if ((val == 1) || (val==0)) {

		down(&data->update_lock);

		mutex_lock(&data->update_lock);

		data->config1 = (data->config1 & ~CFG1_THERM_HOT) | (val << 4);

		adm1026_write_value(client, ADM1026_REG_CONFIG1, 

			data->config1);

		up(&data->update_lock);

		mutex_unlock(&data->update_lock);

	}

	return count;

}
@@ -1184,11 +1185,11 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr, 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_crit[nr] = TEMP_TO_REG(val);

	adm1026_write_value(client, ADM1026_REG_TEMP_THERM[nr],

		data->temp_crit[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1212,10 +1213,10 @@ static ssize_t set_analog_out_reg(struct device *dev, struct device_attribute *a 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->analog_out = DAC_TO_REG(val);

	adm1026_write_value(client, ADM1026_REG_DAC, data->analog_out);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1267,7 +1268,7 @@ static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr, 
	int val = simple_strtol(buf, NULL, 10);

	unsigned long mask;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->alarm_mask = val & 0x7fffffff;

	mask = data->alarm_mask

		| (data->gpio_mask & 0x10000 ? 0x80000000 : 0);
@@ -1282,7 +1283,7 @@ static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr, 
	mask >>= 8;

	adm1026_write_value(client, ADM1026_REG_MASK4,

		mask & 0xff);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1303,7 +1304,7 @@ static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const 
	int val = simple_strtol(buf, NULL, 10);

	long   gpio;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->gpio = val & 0x1ffff;

	gpio = data->gpio;

	adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_0_7,gpio & 0xff);
@@ -1311,7 +1312,7 @@ static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const 
	adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_8_15,gpio & 0xff);

	gpio = ((gpio >> 1) & 0x80) | (data->alarms >> 24 & 0x7f);

	adm1026_write_value(client, ADM1026_REG_STATUS4,gpio & 0xff);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1331,7 +1332,7 @@ static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr, 
	int val = simple_strtol(buf, NULL, 10);

	long   mask;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->gpio_mask = val & 0x1ffff;

	mask = data->gpio_mask;

	adm1026_write_value(client, ADM1026_REG_GPIO_MASK_0_7,mask & 0xff);
@@ -1339,7 +1340,7 @@ static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr, 
	adm1026_write_value(client, ADM1026_REG_GPIO_MASK_8_15,mask & 0xff);

	mask = ((mask >> 1) & 0x80) | (data->alarm_mask >> 24 & 0x7f);

	adm1026_write_value(client, ADM1026_REG_MASK1,mask & 0xff);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -1359,10 +1360,10 @@ static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, co 
	if (data->pwm1.enable == 1) {

		int val = simple_strtol(buf, NULL, 10);



		down(&data->update_lock);

		mutex_lock(&data->update_lock);

		data->pwm1.pwm = PWM_TO_REG(val);

		adm1026_write_value(client, ADM1026_REG_PWM, data->pwm1.pwm);

		up(&data->update_lock);

		mutex_unlock(&data->update_lock);

	}

	return count;

}
@@ -1378,14 +1379,14 @@ static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *att 
	struct adm1026_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->pwm1.auto_pwm_min = SENSORS_LIMIT(val,0,255);

	if (data->pwm1.enable == 2) { /* apply immediately */

		data->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) |

			PWM_MIN_TO_REG(data->pwm1.auto_pwm_min)); 

		adm1026_write_value(client, ADM1026_REG_PWM, data->pwm1.pwm);

	}

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t show_auto_pwm_max(struct device *dev, struct device_attribute *attr, char *buf)
@@ -1406,7 +1407,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, 
	int     old_enable;



	if ((val >= 0) && (val < 3)) {

		down(&data->update_lock);

		mutex_lock(&data->update_lock);

		old_enable = data->pwm1.enable;

		data->pwm1.enable = val;

		data->config1 = (data->config1 & ~CFG1_PWM_AFC)
@@ -1424,7 +1425,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, 
			adm1026_write_value(client, ADM1026_REG_PWM, 

				data->pwm1.pwm);

		}

		up(&data->update_lock);

		mutex_unlock(&data->update_lock);

	}

	return count;

}
@@ -1541,7 +1542,7 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address, 
	/* Fill in the remaining client fields */

	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)))

drivers/hwmon/adm1031.c

+25 −24
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/i2c.h>

#include <linux/hwmon.h>

#include <linux/err.h>

#include <linux/mutex.h>



/* Following macros takes channel parameter starting from 0 to 2 */

#define ADM1031_REG_FAN_SPEED(nr)	(0x08 + (nr))
@@ -70,7 +71,7 @@ typedef u8 auto_chan_table_t[8][2]; 
struct adm1031_data {

	struct i2c_client client;

	struct class_device *class_dev;

	struct semaphore update_lock;

	struct mutex update_lock;

	int chip_type;

	char valid;		/* !=0 if following fields are valid */

	unsigned long last_updated;	/* In jiffies */
@@ -262,10 +263,10 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr) 


	old_fan_mode = data->conf1;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	

	if ((ret = get_fan_auto_nearest(data, nr, val, data->conf1, &reg))) {

		up(&data->update_lock);

		mutex_unlock(&data->update_lock);

		return ret;

	}

	if (((data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1)) & ADM1031_CONF1_AUTO_MODE) ^
@@ -288,7 +289,7 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr) 
	}

	data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1);

	adm1031_write_value(client, ADM1031_REG_CONF1, data->conf1);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -329,11 +330,11 @@ set_auto_temp_min(struct device *dev, const char *buf, size_t count, int nr) 
	struct adm1031_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->auto_temp[nr] = AUTO_TEMP_MIN_TO_REG(val, data->auto_temp[nr]);

	adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),

			    data->auto_temp[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t show_auto_temp_max(struct device *dev, char *buf, int nr)
@@ -349,11 +350,11 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr) 
	struct adm1031_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data->auto_temp[nr], data->pwm[nr]);

	adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),

			    data->temp_max[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -405,11 +406,11 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr) 
	int val = simple_strtol(buf, NULL, 10);

	int reg;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) && 

	    (((val>>4) & 0xf) != 5)) {

		/* In automatic mode, the only PWM accepted is 33% */

		up(&data->update_lock);

		mutex_unlock(&data->update_lock);

		return -EINVAL;

	}

	data->pwm[nr] = PWM_TO_REG(val);
@@ -417,7 +418,7 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr) 
	adm1031_write_value(client, ADM1031_REG_PWM,

			    nr ? ((data->pwm[nr] << 4) & 0xf0) | (reg & 0xf)

			    : (data->pwm[nr] & 0xf) | (reg & 0xf0));

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -511,7 +512,7 @@ set_fan_min(struct device *dev, const char *buf, size_t count, int nr) 
	struct adm1031_data *data = i2c_get_clientdata(client);

	int val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	if (val) {

		data->fan_min[nr] = 

			FAN_TO_REG(val, FAN_DIV_FROM_REG(data->fan_div[nr]));
@@ -519,7 +520,7 @@ set_fan_min(struct device *dev, const char *buf, size_t count, int nr) 
		data->fan_min[nr] = 0xff;

	}

	adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr), data->fan_min[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t
@@ -540,7 +541,7 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr) 
	if (tmp == 0xff)

		return -EINVAL;

	

	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	old_div = FAN_DIV_FROM_REG(data->fan_div[nr]);

	data->fan_div[nr] = (tmp & 0xC0) | (0x3f & data->fan_div[nr]);

	new_min = data->fan_min[nr] * old_div /
@@ -553,7 +554,7 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr) 
			    data->fan_div[nr]);

	adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr), 

			    data->fan_min[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -627,11 +628,11 @@ set_temp_min(struct device *dev, const char *buf, size_t count, int nr) 


	val = simple_strtol(buf, NULL, 10);

	val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);

	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_min[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_MIN(nr),

			    data->temp_min[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t
@@ -643,11 +644,11 @@ set_temp_max(struct device *dev, const char *buf, size_t count, int nr) 


	val = simple_strtol(buf, NULL, 10);

	val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);

	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_max[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_MAX(nr),

			    data->temp_max[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t
@@ -659,11 +660,11 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr) 


	val = simple_strtol(buf, NULL, 10);

	val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);

	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_crit[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_CRIT(nr),

			    data->temp_crit[nr]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -778,7 +779,7 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind) 


	strlcpy(new_client->name, name, I2C_NAME_SIZE);

	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)))
@@ -891,7 +892,7 @@ static struct adm1031_data *adm1031_update_device(struct device *dev) 
	struct adm1031_data *data = i2c_get_clientdata(client);

	int chan;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);



	if (time_after(jiffies, data->last_updated + HZ + HZ / 2)

	    || !data->valid) {
@@ -965,7 +966,7 @@ static struct adm1031_data *adm1031_update_device(struct device *dev) 
		data->valid = 1;

	}



	up(&data->update_lock);

	mutex_unlock(&data->update_lock);



	return data;

}

drivers/hwmon/adm9240.c

+15 −14
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/hwmon.h>

#include <linux/hwmon-vid.h>

#include <linux/err.h>

#include <linux/mutex.h>



/* Addresses to scan */

static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
@@ -150,7 +151,7 @@ struct adm9240_data { 
	enum chips type;

	struct i2c_client client;

	struct class_device *class_dev;

	struct semaphore update_lock;

	struct mutex update_lock;

	char valid;

	unsigned long last_updated_measure;

	unsigned long last_updated_config;
@@ -195,11 +196,11 @@ static ssize_t set_max(struct device *dev, struct device_attribute *devattr, 
	struct adm9240_data *data = i2c_get_clientdata(client);

	long val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->temp_max[attr->index] = TEMP_TO_REG(val);

	i2c_smbus_write_byte_data(client, ADM9240_REG_TEMP_MAX(attr->index),

			data->temp_max[attr->index]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -246,11 +247,11 @@ static ssize_t set_in_min(struct device *dev, 
	struct adm9240_data *data = i2c_get_clientdata(client);

	unsigned long val = simple_strtoul(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->in_min[attr->index] = IN_TO_REG(val, attr->index);

	i2c_smbus_write_byte_data(client, ADM9240_REG_IN_MIN(attr->index),

			data->in_min[attr->index]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -263,11 +264,11 @@ static ssize_t set_in_max(struct device *dev, 
	struct adm9240_data *data = i2c_get_clientdata(client);

	unsigned long val = simple_strtoul(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->in_max[attr->index] = IN_TO_REG(val, attr->index);

	i2c_smbus_write_byte_data(client, ADM9240_REG_IN_MAX(attr->index),

			data->in_max[attr->index]);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -350,7 +351,7 @@ static ssize_t set_fan_min(struct device *dev, 
	int nr = attr->index;

	u8 new_div;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);



	if (!val) {

		data->fan_min[nr] = 255;
@@ -390,7 +391,7 @@ static ssize_t set_fan_min(struct device *dev, 
	i2c_smbus_write_byte_data(client, ADM9240_REG_FAN_MIN(nr),

			data->fan_min[nr]);



	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -439,10 +440,10 @@ static ssize_t set_aout(struct device *dev, 
	struct adm9240_data *data = i2c_get_clientdata(client);

	unsigned long val = simple_strtol(buf, NULL, 10);



	down(&data->update_lock);

	mutex_lock(&data->update_lock);

	data->aout = AOUT_TO_REG(val);

	i2c_smbus_write_byte_data(client, ADM9240_REG_ANALOG_OUT, data->aout);

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return count;

}

static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);
@@ -539,7 +540,7 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind) 
	/* fill in the remaining client fields and attach */

	strlcpy(new_client->name, name, I2C_NAME_SIZE);

	data->type = kind;

	init_MUTEX(&data->update_lock);

	mutex_init(&data->update_lock);



	if ((err = i2c_attach_client(new_client)))

		goto exit_free;
@@ -691,7 +692,7 @@ static struct adm9240_data *adm9240_update_device(struct device *dev) 
	struct adm9240_data *data = i2c_get_clientdata(client);

	int i;



	down(&data->update_lock);

	mutex_lock(&data->update_lock);



	/* minimum measurement cycle: 1.75 seconds */

	if (time_after(jiffies, data->last_updated_measure + (HZ * 7 / 4))
@@ -771,7 +772,7 @@ static struct adm9240_data *adm9240_update_device(struct device *dev) 
		data->last_updated_config = jiffies;

		data->valid = 1;

	}

	up(&data->update_lock);

	mutex_unlock(&data->update_lock);

	return data;

}