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

Commit e281e315 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: (it87) Fix VID reading on IT8718F/IT8720F
  hwmon: (dme1737) No vid attributes for SCH311x
  hwmon: (fschmd) Fix check on unsigned in watchdog_write()
  hwmon: (coretemp) Maintainer update
parents 49b766ec 371dc4a6

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1488,6 +1488,7 @@ F: mm/*cgroup* 


CORETEMP HARDWARE MONITORING DRIVER

M:	Rudolf Marek <r.marek@assembler.cz>

M:	Huaxu Wan <huaxu.wan@intel.com>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/coretemp

drivers/hwmon/dme1737.c

+24 −5
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static struct dme1737_data *dme1737_update_device(struct device *dev) 


	/* Sample register contents every 1 sec */

	if (time_after(jiffies, data->last_update + HZ) || !data->valid) {

		if (data->type != sch5027) {

		if (data->type == dme1737) {

			data->vid = dme1737_read(data, DME1737_REG_VID) &

				0x3f;

		}
@@ -1621,9 +1621,6 @@ static struct attribute *dme1737_misc_attr[] = { 
	&sensor_dev_attr_zone1_auto_point1_temp_hyst.dev_attr.attr,

	&sensor_dev_attr_zone2_auto_point1_temp_hyst.dev_attr.attr,

	&sensor_dev_attr_zone3_auto_point1_temp_hyst.dev_attr.attr,

	/* Misc */

	&dev_attr_vrm.attr,

	&dev_attr_cpu0_vid.attr,

	NULL

};
@@ -1631,6 +1628,18 @@ static const struct attribute_group dme1737_misc_group = { 
	.attrs = dme1737_misc_attr,

};



/* The following struct holds VID-related attributes. Their creation

   depends on the chip type which is determined during module load. */

static struct attribute *dme1737_vid_attr[] = {

	&dev_attr_vrm.attr,

	&dev_attr_cpu0_vid.attr,

	NULL

};



static const struct attribute_group dme1737_vid_group = {

	.attrs = dme1737_vid_attr,

};



/* The following structs hold the PWM attributes, some of which are optional.

 * Their creation depends on the chip configuration which is determined during

 * module load. */
@@ -1902,6 +1911,9 @@ static void dme1737_remove_files(struct device *dev) 
	if (data->type != sch5027) {

		sysfs_remove_group(&dev->kobj, &dme1737_misc_group);

	}

	if (data->type == dme1737) {

		sysfs_remove_group(&dev->kobj, &dme1737_vid_group);

	}



	sysfs_remove_group(&dev->kobj, &dme1737_group);
@@ -1933,6 +1945,13 @@ static int dme1737_create_files(struct device *dev) 
		goto exit_remove;

	}



	/* Create VID-related sysfs attributes */

	if ((data->type == dme1737) &&

	    (err = sysfs_create_group(&dev->kobj,

				      &dme1737_vid_group))) {

		goto exit_remove;

	}



	/* Create fan sysfs attributes */

	for (ix = 0; ix < ARRAY_SIZE(dme1737_fan_group); ix++) {

		if (data->has_fan & (1 << ix)) {
@@ -2127,7 +2146,7 @@ static int dme1737_init_device(struct device *dev) 
	data->pwm_acz[2] = 4;	/* pwm3 -> zone3 */



	/* Set VRM */

	if (data->type != sch5027) {

	if (data->type == dme1737) {

		data->vrm = vid_which_vrm();

	}

drivers/hwmon/fschmd.c

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static int watchdog_release(struct inode *inode, struct file *filp) 
static ssize_t watchdog_write(struct file *filp, const char __user *buf,

	size_t count, loff_t *offset)

{

	size_t ret;

	int ret;

	struct fschmd_data *data = filp->private_data;



	if (count) {

drivers/hwmon/it87.c

+2 −3
Original line number Diff line number Diff line
@@ -1028,12 +1028,11 @@ static int __init it87_find(unsigned short *address, 
		chip_type, *address, sio_data->revision);



	/* Read GPIO config and VID value from LDN 7 (GPIO) */

	if (chip_type != IT8705F_DEVID) {

	if (sio_data->type != it87) {

		int reg;



		superio_select(GPIO);

		if ((chip_type == it8718) ||

		    (chip_type == it8720))

		if (sio_data->type == it8718 || sio_data->type == it8720)

			sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);



		reg = superio_inb(IT87_SIO_PINX2_REG);