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

Commit ce8c6ce1 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

hwmon: Fix unchecked return status, SMSC chips 



hwmon: Fix unchecked return status, SMSC chips

Fix up 2 more hwmon drivers so that they no longer ignore return
status from device_create_file().

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a5ebe668

drivers/hwmon/smsc47m1.c

+60 −18
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/err.h>

#include <linux/init.h>

#include <linux/mutex.h>

#include <linux/sysfs.h>

#include <asm/io.h>



/* Address is autodetected, there is no default value */
@@ -347,6 +348,30 @@ fan_present(2); 


static DEVICE_ATTR(alarms, S_IRUGO, get_alarms, NULL);



/* Almost all sysfs files may or may not be created depending on the chip

   setup so we create them individually. It is still convenient to define a

   group to remove them all at once. */

static struct attribute *smsc47m1_attributes[] = {

	&dev_attr_fan1_input.attr,

	&dev_attr_fan1_min.attr,

	&dev_attr_fan1_div.attr,

	&dev_attr_fan2_input.attr,

	&dev_attr_fan2_min.attr,

	&dev_attr_fan2_div.attr,



	&dev_attr_pwm1.attr,

	&dev_attr_pwm1_enable.attr,

	&dev_attr_pwm2.attr,

	&dev_attr_pwm2_enable.attr,



	&dev_attr_alarms.attr,

	NULL

};



static const struct attribute_group smsc47m1_group = {

	.attrs = smsc47m1_attributes,

};



static int __init smsc47m1_find(unsigned short *addr)

{

	u8 val;
@@ -447,46 +472,62 @@ static int smsc47m1_detect(struct i2c_adapter *adapter) 
	smsc47m1_update_device(&new_client->dev, 1);



	/* Register sysfs hooks */

	data->class_dev = hwmon_device_register(&new_client->dev);

	if (IS_ERR(data->class_dev)) {

		err = PTR_ERR(data->class_dev);

		goto error_detach;

	}



	if (fan1) {

		device_create_file(&new_client->dev, &dev_attr_fan1_input);

		device_create_file(&new_client->dev, &dev_attr_fan1_min);

		device_create_file(&new_client->dev, &dev_attr_fan1_div);

		if ((err = device_create_file(&new_client->dev,

					      &dev_attr_fan1_input))

		 || (err = device_create_file(&new_client->dev,

					      &dev_attr_fan1_min))

		 || (err = device_create_file(&new_client->dev,

					      &dev_attr_fan1_div)))

			goto error_remove_files;

	} else

		dev_dbg(&new_client->dev, "Fan 1 not enabled by hardware, "

			"skipping\n");



	if (fan2) {

		device_create_file(&new_client->dev, &dev_attr_fan2_input);

		device_create_file(&new_client->dev, &dev_attr_fan2_min);

		device_create_file(&new_client->dev, &dev_attr_fan2_div);

		if ((err = device_create_file(&new_client->dev,

					      &dev_attr_fan2_input))

		 || (err = device_create_file(&new_client->dev,

					      &dev_attr_fan2_min))

		 || (err = device_create_file(&new_client->dev,

					      &dev_attr_fan2_div)))

			goto error_remove_files;

	} else

		dev_dbg(&new_client->dev, "Fan 2 not enabled by hardware, "

			"skipping\n");



	if (pwm1) {

		device_create_file(&new_client->dev, &dev_attr_pwm1);

		device_create_file(&new_client->dev, &dev_attr_pwm1_enable);

		if ((err = device_create_file(&new_client->dev,

					      &dev_attr_pwm1))

		 || (err = device_create_file(&new_client->dev,

					      &dev_attr_pwm1_enable)))

			goto error_remove_files;

	} else

		dev_dbg(&new_client->dev, "PWM 1 not enabled by hardware, "

			"skipping\n");

	if (pwm2) {

		device_create_file(&new_client->dev, &dev_attr_pwm2);

		device_create_file(&new_client->dev, &dev_attr_pwm2_enable);

		if ((err = device_create_file(&new_client->dev,

					      &dev_attr_pwm2))

		 || (err = device_create_file(&new_client->dev,

					      &dev_attr_pwm2_enable)))

			goto error_remove_files;

	} else

		dev_dbg(&new_client->dev, "PWM 2 not enabled by hardware, "

			"skipping\n");



	device_create_file(&new_client->dev, &dev_attr_alarms);

	if ((err = device_create_file(&new_client->dev, &dev_attr_alarms)))

		goto error_remove_files;



	data->class_dev = hwmon_device_register(&new_client->dev);

	if (IS_ERR(data->class_dev)) {

		err = PTR_ERR(data->class_dev);

		goto error_remove_files;

	}



	return 0;



error_detach:

error_remove_files:

	sysfs_remove_group(&new_client->dev.kobj, &smsc47m1_group);

	i2c_detach_client(new_client);

error_free:

	kfree(data);
@@ -501,6 +542,7 @@ static int smsc47m1_detach_client(struct i2c_client *client) 
	int err;



	hwmon_device_unregister(data->class_dev);

	sysfs_remove_group(&client->dev.kobj, &smsc47m1_group);



	if ((err = i2c_detach_client(client)))

		return err;

drivers/hwmon/smsc47m192.c

+85 −65
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/hwmon-sysfs.h>

#include <linux/hwmon-vid.h>

#include <linux/err.h>

#include <linux/sysfs.h>



/* Addresses to scan */

static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
@@ -370,6 +371,75 @@ static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 0x0200); 
static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 0x0400);

static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 0x0800);



static struct attribute *smsc47m192_attributes[] = {

	&sensor_dev_attr_in0_input.dev_attr.attr,

	&sensor_dev_attr_in0_min.dev_attr.attr,

	&sensor_dev_attr_in0_max.dev_attr.attr,

	&sensor_dev_attr_in0_alarm.dev_attr.attr,

	&sensor_dev_attr_in1_input.dev_attr.attr,

	&sensor_dev_attr_in1_min.dev_attr.attr,

	&sensor_dev_attr_in1_max.dev_attr.attr,

	&sensor_dev_attr_in1_alarm.dev_attr.attr,

	&sensor_dev_attr_in2_input.dev_attr.attr,

	&sensor_dev_attr_in2_min.dev_attr.attr,

	&sensor_dev_attr_in2_max.dev_attr.attr,

	&sensor_dev_attr_in2_alarm.dev_attr.attr,

	&sensor_dev_attr_in3_input.dev_attr.attr,

	&sensor_dev_attr_in3_min.dev_attr.attr,

	&sensor_dev_attr_in3_max.dev_attr.attr,

	&sensor_dev_attr_in3_alarm.dev_attr.attr,

	&sensor_dev_attr_in5_input.dev_attr.attr,

	&sensor_dev_attr_in5_min.dev_attr.attr,

	&sensor_dev_attr_in5_max.dev_attr.attr,

	&sensor_dev_attr_in5_alarm.dev_attr.attr,

	&sensor_dev_attr_in6_input.dev_attr.attr,

	&sensor_dev_attr_in6_min.dev_attr.attr,

	&sensor_dev_attr_in6_max.dev_attr.attr,

	&sensor_dev_attr_in6_alarm.dev_attr.attr,

	&sensor_dev_attr_in7_input.dev_attr.attr,

	&sensor_dev_attr_in7_min.dev_attr.attr,

	&sensor_dev_attr_in7_max.dev_attr.attr,

	&sensor_dev_attr_in7_alarm.dev_attr.attr,



	&sensor_dev_attr_temp1_input.dev_attr.attr,

	&sensor_dev_attr_temp1_max.dev_attr.attr,

	&sensor_dev_attr_temp1_min.dev_attr.attr,

	&sensor_dev_attr_temp1_offset.dev_attr.attr,

	&sensor_dev_attr_temp1_alarm.dev_attr.attr,

	&sensor_dev_attr_temp2_input.dev_attr.attr,

	&sensor_dev_attr_temp2_max.dev_attr.attr,

	&sensor_dev_attr_temp2_min.dev_attr.attr,

	&sensor_dev_attr_temp2_offset.dev_attr.attr,

	&sensor_dev_attr_temp2_alarm.dev_attr.attr,

	&sensor_dev_attr_temp2_input_fault.dev_attr.attr,

	&sensor_dev_attr_temp3_input.dev_attr.attr,

	&sensor_dev_attr_temp3_max.dev_attr.attr,

	&sensor_dev_attr_temp3_min.dev_attr.attr,

	&sensor_dev_attr_temp3_offset.dev_attr.attr,

	&sensor_dev_attr_temp3_alarm.dev_attr.attr,

	&sensor_dev_attr_temp3_input_fault.dev_attr.attr,



	&dev_attr_cpu0_vid.attr,

	&dev_attr_vrm.attr,

	NULL

};



static const struct attribute_group smsc47m192_group = {

	.attrs = smsc47m192_attributes,

};



static struct attribute *smsc47m192_attributes_in4[] = {

	&sensor_dev_attr_in4_input.dev_attr.attr,

	&sensor_dev_attr_in4_min.dev_attr.attr,

	&sensor_dev_attr_in4_max.dev_attr.attr,

	&sensor_dev_attr_in4_alarm.dev_attr.attr,

	NULL

};



static const struct attribute_group smsc47m192_group_in4 = {

	.attrs = smsc47m192_attributes_in4,

};



/* This function is called when:

    * smsc47m192_driver is inserted (when this module is loaded), for each

      available adapter
@@ -471,80 +541,28 @@ static int smsc47m192_detect(struct i2c_adapter *adapter, int address, 
	smsc47m192_init_client(client);



	/* Register sysfs hooks */

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

	if (IS_ERR(data->class_dev)) {

		err = PTR_ERR(data->class_dev);

	if ((err = sysfs_create_group(&client->dev.kobj, &smsc47m192_group)))

		goto exit_detach;

	}



	device_create_file(&client->dev, &sensor_dev_attr_in0_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in0_min.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in0_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in0_alarm.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in1_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in1_min.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in1_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in1_alarm.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in2_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in2_min.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in2_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in2_alarm.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in3_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in3_min.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in3_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in3_alarm.dev_attr);



	/* Pin 110 is either in4 (+12V) or VID4 */

	config = i2c_smbus_read_byte_data(client, SMSC47M192_REG_CONFIG);

	if (!(config & 0x20)) {

		device_create_file(&client->dev,

				   &sensor_dev_attr_in4_input.dev_attr);

		device_create_file(&client->dev,

				   &sensor_dev_attr_in4_min.dev_attr);

		device_create_file(&client->dev,

				   &sensor_dev_attr_in4_max.dev_attr);

		device_create_file(&client->dev,

				   &sensor_dev_attr_in4_alarm.dev_attr);

	}

	device_create_file(&client->dev, &sensor_dev_attr_in5_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in5_min.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in5_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in5_alarm.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in6_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in6_min.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in6_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in6_alarm.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in7_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in7_min.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in7_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_in7_alarm.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp1_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp1_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp1_min.dev_attr);

	device_create_file(&client->dev,

			   &sensor_dev_attr_temp1_offset.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp1_alarm.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp2_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp2_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp2_min.dev_attr);

	device_create_file(&client->dev,

			   &sensor_dev_attr_temp2_offset.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp2_alarm.dev_attr);

	device_create_file(&client->dev,

			   &sensor_dev_attr_temp2_input_fault.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp3_input.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp3_max.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp3_min.dev_attr);

	device_create_file(&client->dev,

			   &sensor_dev_attr_temp3_offset.dev_attr);

	device_create_file(&client->dev, &sensor_dev_attr_temp3_alarm.dev_attr);

	device_create_file(&client->dev,

			   &sensor_dev_attr_temp3_input_fault.dev_attr);

	device_create_file(&client->dev, &dev_attr_cpu0_vid);

	device_create_file(&client->dev, &dev_attr_vrm);

		if ((err = sysfs_create_group(&client->dev.kobj,

					      &smsc47m192_group_in4)))

			goto exit_remove_files;

	}



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

	if (IS_ERR(data->class_dev)) {

		err = PTR_ERR(data->class_dev);

		goto exit_remove_files;

	}



	return 0;



exit_remove_files:

	sysfs_remove_group(&client->dev.kobj, &smsc47m192_group);

	sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4);

exit_detach:

	i2c_detach_client(client);

exit_free:
@@ -559,6 +577,8 @@ static int smsc47m192_detach_client(struct i2c_client *client) 
	int err;



	hwmon_device_unregister(data->class_dev);

	sysfs_remove_group(&client->dev.kobj, &smsc47m192_group);

	sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4);



	if ((err = i2c_detach_client(client)))

		return err;