From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Delvare Subject: Re: [PATCH v1 12/15] hwmon: (w83793) Remove duplicate NULL check Date: Tue, 31 Oct 2017 20:43:29 +0100 Message-ID: <20171031204329.00a8c776@endymion> References: <20171031142149.32512-1-andriy.shevchenko@linux.intel.com> <20171031142149.32512-12-andriy.shevchenko@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de ([195.135.220.15]:41647 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751366AbdJaTnc (ORCPT ); Tue, 31 Oct 2017 15:43:32 -0400 In-Reply-To: <20171031142149.32512-12-andriy.shevchenko@linux.intel.com> Sender: linux-i2c-owner@vger.kernel.org List-Id: linux-i2c@vger.kernel.org To: Andy Shevchenko Cc: linux-i2c@vger.kernel.org, Wolfram Sang , Rudolf Marek , Guenter Roeck , linux-hwmon@vger.kernel.org On Tue, 31 Oct 2017 16:21:46 +0200, Andy Shevchenko wrote: > Since i2c_unregister_device() became NULL-aware we may remove duplicate > NULL check. > > Cc: Rudolf Marek > Cc: Jean Delvare > Cc: Guenter Roeck > Cc: linux-hwmon@vger.kernel.org > Signed-off-by: Andy Shevchenko > --- > drivers/hwmon/w83793.c | 15 +++++---------- > 1 file 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 @@ static int w83793_probe(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]); > free_mem: > kfree(data); > exit: Reviewed-by: Jean Delvare -- Jean Delvare SUSE L3 Support