Commit 509344b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (lm95241) Replace rate sysfs attribute with update_interval
  hwmon: (adm1031) Replace update_rate sysfs attribute with update_interval
  hwmon: (w83627ehf) Use proper exit sequence
  hwmon: (emc1403) Remove unnecessary hwmon_device_unregister
  hwmon: (f75375s) Do not overwrite values read from registers
  hwmon: (f75375s) Shift control mode to the correct bit position
  hwmon: New subsystem maintainers
  hwmon: (lis3lv02d) Prevent NULL pointer dereference
parents 80214df8 bc482bf0

Documentation/hwmon/sysfs-interface

+3 −4
Original line number Diff line number Diff line
@@ -91,12 +91,11 @@ name The chip name. 
		I2C devices get this attribute created automatically.

		RO



update_rate	The rate at which the chip will update readings.

update_interval	The interval at which the chip will update readings.

		Unit: millisecond

		RW

		Some devices have a variable update rate. This attribute

		can be used to change the update rate to the desired

		frequency.

		Some devices have a variable update rate or interval.

		This attribute can be used to change it to the desired value.





************

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -2657,9 +2657,12 @@ S: Maintained 
F:	drivers/media/video/gspca/



HARDWARE MONITORING

M:	Jean Delvare <khali@linux-fr.org>

M:	Guenter Roeck <guenter.roeck@ericsson.com>

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

S:	Orphan

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/

S:	Maintained

F:	Documentation/hwmon/

F:	drivers/hwmon/

F:	include/linux/hwmon*.h

drivers/hwmon/adm1031.c

+24 −19
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct adm1031_data { 
	int chip_type;

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

	unsigned long last_updated;	/* In jiffies */

	unsigned int update_rate;	/* In milliseconds */

	unsigned int update_interval;	/* In milliseconds */

	/* The chan_select_table contains the possible configurations for

	 * auto fan control.

	 */
@@ -743,21 +743,21 @@ static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 12); 
static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 13);

static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 14);



/* Update Rate */

static const unsigned int update_rates[] = {

/* Update Interval */

static const unsigned int update_intervals[] = {

	16000, 8000, 4000, 2000, 1000, 500, 250, 125,

};



static ssize_t show_update_rate(struct device *dev,

static ssize_t show_update_interval(struct device *dev,

				    struct device_attribute *attr, char *buf)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct adm1031_data *data = i2c_get_clientdata(client);



	return sprintf(buf, "%u\n", data->update_rate);

	return sprintf(buf, "%u\n", data->update_interval);

}



static ssize_t set_update_rate(struct device *dev,

static ssize_t set_update_interval(struct device *dev,

				   struct device_attribute *attr,

				   const char *buf, size_t count)

{
@@ -771,12 +771,15 @@ static ssize_t set_update_rate(struct device *dev, 
	if (err)

		return err;



	/* find the nearest update rate from the table */

	for (i = 0; i < ARRAY_SIZE(update_rates) - 1; i++) {

		if (val >= update_rates[i])

	/*

	 * Find the nearest update interval from the table.

	 * Use it to determine the matching update rate.

	 */

	for (i = 0; i < ARRAY_SIZE(update_intervals) - 1; i++) {

		if (val >= update_intervals[i])

			break;

	}

	/* if not found, we point to the last entry (lowest update rate) */

	/* if not found, we point to the last entry (lowest update interval) */



	/* set the new update rate while preserving other settings */

	reg = adm1031_read_value(client, ADM1031_REG_FAN_FILTER);
@@ -785,14 +788,14 @@ static ssize_t set_update_rate(struct device *dev, 
	adm1031_write_value(client, ADM1031_REG_FAN_FILTER, reg);



	mutex_lock(&data->update_lock);

	data->update_rate = update_rates[i];

	data->update_interval = update_intervals[i];

	mutex_unlock(&data->update_lock);



	return count;

}



static DEVICE_ATTR(update_rate, S_IRUGO | S_IWUSR, show_update_rate,

		   set_update_rate);

static DEVICE_ATTR(update_interval, S_IRUGO | S_IWUSR, show_update_interval,

		   set_update_interval);



static struct attribute *adm1031_attributes[] = {

	&sensor_dev_attr_fan1_input.dev_attr.attr,
@@ -830,7 +833,7 @@ static struct attribute *adm1031_attributes[] = { 


	&sensor_dev_attr_auto_fan1_min_pwm.dev_attr.attr,



	&dev_attr_update_rate.attr,

	&dev_attr_update_interval.attr,

	&dev_attr_alarms.attr,



	NULL
@@ -981,7 +984,8 @@ static void adm1031_init_client(struct i2c_client *client) 
	mask = ADM1031_UPDATE_RATE_MASK;

	read_val = adm1031_read_value(client, ADM1031_REG_FAN_FILTER);

	i = (read_val & mask) >> ADM1031_UPDATE_RATE_SHIFT;

	data->update_rate = update_rates[i];

	/* Save it as update interval */

	data->update_interval = update_intervals[i];

}



static struct adm1031_data *adm1031_update_device(struct device *dev)
@@ -993,7 +997,8 @@ static struct adm1031_data *adm1031_update_device(struct device *dev) 


	mutex_lock(&data->update_lock);



	next_update = data->last_updated + msecs_to_jiffies(data->update_rate);

	next_update = data->last_updated

	  + msecs_to_jiffies(data->update_interval);

	if (time_after(jiffies, next_update) || !data->valid) {



		dev_dbg(&client->dev, "Starting adm1031 update\n");

drivers/hwmon/emc1403.c

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ static int emc1403_probe(struct i2c_client *client, 
	res = sysfs_create_group(&client->dev.kobj, &m_thermal_gr);

	if (res) {

		dev_warn(&client->dev, "create group failed\n");

		hwmon_device_unregister(data->hwmon_dev);

		goto thermal_error1;

	}

	data->hwmon_dev = hwmon_device_register(&client->dev);

drivers/hwmon/f75375s.c

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ enum chips { f75373, f75375 }; 
#define F75375_REG_PWM2_DROP_DUTY	0x6C



#define FAN_CTRL_LINEAR(nr)		(4 + nr)

#define FAN_CTRL_MODE(nr)		(5 + ((nr) * 2))

#define FAN_CTRL_MODE(nr)		(4 + ((nr) * 2))



/*

 * Data structures and manipulation thereof
@@ -298,7 +298,7 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val) 
		return -EINVAL;



	fanmode = f75375_read8(client, F75375_REG_FAN_TIMER);

	fanmode = ~(3 << FAN_CTRL_MODE(nr));

	fanmode &= ~(3 << FAN_CTRL_MODE(nr));



	switch (val) {

	case 0: /* Full speed */
@@ -350,7 +350,7 @@ static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr, 


	mutex_lock(&data->update_lock);

	conf = f75375_read8(client, F75375_REG_CONFIG1);

	conf = ~(1 << FAN_CTRL_LINEAR(nr));

	conf &= ~(1 << FAN_CTRL_LINEAR(nr));



	if (val == 0)

		conf |= (1 << FAN_CTRL_LINEAR(nr)) ;

CRA Git | Maintained and supported by SUSTech CRA and CCSE