diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-10-31 16:21:46 +0200 |
|---|---|---|
| committer |   Guenter Roeck <linux@roeck-us.net> | 2017-11-16 01:03:19 -0800 |
| commit | 7adce422dd90bd673ef5c4da32c896bf740e3277 (patch) | |
| tree | 5b0da78e88ecdea5c168d71740ccd48678ce4c9b /drivers/hwmon/w83793.c | |
| parent | hwmon: (w83792d) Remove duplicate NULL check (diff) | |
| download | linux-dev-7adce422dd90bd673ef5c4da32c896bf740e3277.tar.xz linux-dev-7adce422dd90bd673ef5c4da32c896bf740e3277.zip | |
hwmon: (w83793) Remove duplicate NULL check
Since i2c_unregister_device() became NULL-aware we may remove duplicate
NULL check.
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/w83793.c')
| -rw-r--r-- | drivers/hwmon/w83793.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index 5ba9d9f1daa1..0af0f6283b35 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c @@ -1564,10 +1564,8 @@ 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]); + i2c_unregister_device(data->lm75[0]); + i2c_unregister_device(data->lm75[1]); /* Decrease data reference counter */ mutex_lock(&watchdog_data_mutex); @@ -1625,8 +1623,7 @@ 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]); + i2c_unregister_device(data->lm75[0]); ERROR_SC_0: return err; } @@ -1962,10 +1959,8 @@ 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]); + i2c_unregister_device(data->lm75[0]); + i2c_unregister_device(data->lm75[1]); free_mem: kfree(data); exit: |