On Wed, 2017-11-01 at 06:19 -0700, Guenter Roeck wrote: > On 10/31/2017 07:21 AM, Andy Shevchenko wrote: > > Since i2c_unregister_device() became NULL-aware we may remove > > duplicate > > NULL check. > > > > Cc: Jean Delvare <jdelvare@xxxxxxxx> > > Cc: Guenter Roeck <linux@xxxxxxxxxxxx> > > Cc: linux-hwmon@xxxxxxxxxxxxxxx > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> > > I'll keep the hwmon patches from this series on hold until the changes > to i2c_unregister_device make it into the tree. Ok with me if the > patches > are merged through some other tree. Wolfram, what do you think? At least we have couple of options: - apply i2c core patch now and wait until rc1 - apply everything through i2c tree - ... > > Guenter > > > --- > > drivers/hwmon/w83781d.c | 12 ++++-------- > > 1 file changed, 4 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c > > index 246fb2365126..2b0f182daa87 100644 > > --- a/drivers/hwmon/w83781d.c > > +++ b/drivers/hwmon/w83781d.c > > @@ -1246,10 +1246,8 @@ 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]); > > + i2c_unregister_device(data->lm75[0]); > > + i2c_unregister_device(data->lm75[1]); > > return err; > > } > > > > @@ -1262,10 +1260,8 @@ 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]); > > + i2c_unregister_device(data->lm75[0]); > > + i2c_unregister_device(data->lm75[1]); > > > > return 0; > > } > > > > -- Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Intel Finland Oy
