Commit d9ef1ccf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.15-take2' of... 

Merge tag 'hwmon-for-linus-v4.15-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull more hwmon updates/fixes from Guenter Roeck:

 - minor bug fix in k10temp driver

 - take advantage of added NULL check in i2c_unregister_device()

* tag 'hwmon-for-linus-v4.15-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (w83793) Remove duplicate NULL check
  hwmon: (w83792d) Remove duplicate NULL check
  hwmon: (w83791d) Remove duplicate NULL check
  hwmon: (w83781d) Remove duplicate NULL check
  hwmon: (k10temp) Correct model name for Ryzen 1600X
parents fc35c196 7adce422

drivers/hwmon/k10temp.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct tctl_offset { 
};



static const struct tctl_offset tctl_offset_table[] = {

	{ 0x17, "AMD Ryzen 7 1600X", 20000 },

	{ 0x17, "AMD Ryzen 5 1600X", 20000 },

	{ 0x17, "AMD Ryzen 7 1700X", 20000 },

	{ 0x17, "AMD Ryzen 7 1800X", 20000 },

	{ 0x17, "AMD Ryzen Threadripper 1950X", 27000 },

drivers/hwmon/w83781d.c

+4 −8
Original line number Diff line number Diff line
@@ -1246,9 +1246,7 @@ w83781d_probe(struct i2c_client *client, const struct i2c_device_id *id) 


 exit_remove_files:

	w83781d_remove_files(dev);

	if (data->lm75[0])

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1])

	i2c_unregister_device(data->lm75[1]);

	return err;

}
@@ -1262,9 +1260,7 @@ w83781d_remove(struct i2c_client *client) 
	hwmon_device_unregister(data->hwmon_dev);

	w83781d_remove_files(dev);



	if (data->lm75[0])

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1])

	i2c_unregister_device(data->lm75[1]);



	return 0;

drivers/hwmon/w83791d.c

+5 −10
Original line number Diff line number Diff line
@@ -1316,7 +1316,6 @@ static int w83791d_detect_subclients(struct i2c_client *client) 
/* Undo inits in case of errors */



error_sc_1:

	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

error_sc_0:

	return err;
@@ -1434,9 +1433,7 @@ error5: 
error4:

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

error3:

	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1] != NULL)

	i2c_unregister_device(data->lm75[1]);

	return err;

}
@@ -1448,9 +1445,7 @@ static int w83791d_remove(struct i2c_client *client) 
	hwmon_device_unregister(data->hwmon_dev);

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



	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1] != NULL)

	i2c_unregister_device(data->lm75[1]);



	return 0;

drivers/hwmon/w83792d.c

+5 −10
Original line number Diff line number Diff line
@@ -981,7 +981,6 @@ w83792d_detect_subclients(struct i2c_client *new_client) 
/* Undo inits in case of errors */



ERROR_SC_1:

	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

ERROR_SC_0:

	return err;
@@ -1456,9 +1455,7 @@ exit_remove_files: 
	for (i = 0; i < ARRAY_SIZE(w83792d_group_fan); i++)

		sysfs_remove_group(&dev->kobj, &w83792d_group_fan[i]);

exit_i2c_unregister:

	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1] != NULL)

	i2c_unregister_device(data->lm75[1]);

	return err;

}
@@ -1475,9 +1472,7 @@ w83792d_remove(struct i2c_client *client) 
		sysfs_remove_group(&client->dev.kobj,

				   &w83792d_group_fan[i]);



	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1] != NULL)

	i2c_unregister_device(data->lm75[1]);



	return 0;

drivers/hwmon/w83793.c

+5 −10
Original line number Diff line number Diff line
@@ -1564,9 +1564,7 @@ static int w83793_remove(struct i2c_client *client) 
	for (i = 0; i < ARRAY_SIZE(w83793_temp); i++)

		device_remove_file(dev, &w83793_temp[i].dev_attr);



	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1] != NULL)

	i2c_unregister_device(data->lm75[1]);



	/* Decrease data reference counter */
@@ -1625,7 +1623,6 @@ w83793_detect_subclients(struct i2c_client *client) 
	/* Undo inits in case of errors */



ERROR_SC_1:

	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

ERROR_SC_0:

	return err;
@@ -1962,9 +1959,7 @@ exit_remove: 
	for (i = 0; i < ARRAY_SIZE(w83793_temp); i++)

		device_remove_file(dev, &w83793_temp[i].dev_attr);



	if (data->lm75[0] != NULL)

	i2c_unregister_device(data->lm75[0]);

	if (data->lm75[1] != NULL)

	i2c_unregister_device(data->lm75[1]);

free_mem:

	kfree(data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE