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

Commit 416c2a6a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Guenter Roeck
Browse files

hwmon: (w83791d) Remove duplicate NULL check 



Since i2c_unregister_device() became NULL-aware we may remove duplicate
NULL check.

Cc: Marc Hulsman <m.hulsman@tudelft.nl>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 0ab21d0e

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 @@ static int w83791d_probe(struct i2c_client *client, 
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;