| Message ID | 20171031142149.32512-10-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [v1,01/15] i2c: Make i2c_unregister_device() NULL-aware | expand |
On Tue, 31 Oct 2017 16:21:44 +0200, Andy Shevchenko wrote: > 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/hwmon/w83791d.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c > index 8af6081b4ab4..28fa3bd2c096 100644 > --- a/drivers/hwmon/w83791d.c > +++ b/drivers/hwmon/w83791d.c > @@ -1316,8 +1316,7 @@ 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]); > + i2c_unregister_device(data->lm75[0]); > error_sc_0: > return err; > } > @@ -1434,10 +1433,8 @@ 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]); > + i2c_unregister_device(data->lm75[0]); > + i2c_unregister_device(data->lm75[1]); > return err; > } > > @@ -1448,10 +1445,8 @@ 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]); > + i2c_unregister_device(data->lm75[0]); > + i2c_unregister_device(data->lm75[1]); > > return 0; > } Reviewed-by: Jean Delvare <jdelvare@suse.de>
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index 8af6081b4ab4..28fa3bd2c096 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c @@ -1316,8 +1316,7 @@ 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]); + i2c_unregister_device(data->lm75[0]); error_sc_0: return err; } @@ -1434,10 +1433,8 @@ 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]); + i2c_unregister_device(data->lm75[0]); + i2c_unregister_device(data->lm75[1]); return err; } @@ -1448,10 +1445,8 @@ 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]); + i2c_unregister_device(data->lm75[0]); + i2c_unregister_device(data->lm75[1]); return 0; }
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/hwmon/w83791d.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)