]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
hwmon: (w83792d) Remove duplicate NULL check
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 31 Oct 2017 14:21:45 +0000 (16:21 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Thu, 16 Nov 2017 09:02:43 +0000 (01:02 -0800)
Since i2c_unregister_device() became NULL-aware we may remove duplicate
NULL check.

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>
drivers/hwmon/w83792d.c

index d764602d70dbef20b251ac0e74281afd934e52ec..76aa39e537e0306930bd207f1ef53540458a08fc 100644 (file)
@@ -981,8 +981,7 @@ 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]);
+       i2c_unregister_device(data->lm75[0]);
 ERROR_SC_0:
        return err;
 }
@@ -1456,10 +1455,8 @@ 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]);
+       i2c_unregister_device(data->lm75[0]);
+       i2c_unregister_device(data->lm75[1]);
        return err;
 }
 
@@ -1475,10 +1472,8 @@ 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]);
+       i2c_unregister_device(data->lm75[0]);
+       i2c_unregister_device(data->lm75[1]);
 
        return 0;
 }