From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Skeggs Date: Fri, 07 Feb 2014 05:37:05 +0000 Subject: Re: [patch] drm/nouveau/hwmon: remove some redundant checks Message-Id: <1439365393.26189549.1391751425086.JavaMail.root@redhat.com> List-Id: References: <20140206092942.GC31780@elgon.mountain> In-Reply-To: <20140206092942.GC31780@elgon.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: Martin Peres , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Dave Airlie ----- Original Message ----- > From: "Dan Carpenter" > To: "David Airlie" > Cc: "Ben Skeggs" , "Martin Peres" , "Ilia Mirkin" , > "Dave Airlie" , dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org > Sent: Thursday, 6 February, 2014 7:29:43 PM > Subject: [patch] drm/nouveau/hwmon: remove some redundant checks > > No need to check "ret" twice in a row. > Got it. Thank you! > Signed-off-by: Dan Carpenter > > diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c > b/drivers/gpu/drm/nouveau/nouveau_hwmon.c > index 4aff04fa483c..5e4ab58f4f6b 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c > +++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c > @@ -587,18 +587,14 @@ nouveau_hwmon_init(struct drm_device *dev) > > /* set the default attributes */ > ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_default_attrgroup); > - if (ret) { > - if (ret) > - goto error; > - } > + if (ret) > + goto error; > > /* if the card has a working thermal sensor */ > if (therm->temp_get(therm) >= 0) { > ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_temp_attrgroup); > - if (ret) { > - if (ret) > - goto error; > - } > + if (ret) > + goto error; > } > > /* if the card has a pwm fan */ > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Skeggs Subject: Re: [patch] drm/nouveau/hwmon: remove some redundant checks Date: Fri, 7 Feb 2014 00:37:05 -0500 (EST) Message-ID: <1439365393.26189549.1391751425086.JavaMail.root@redhat.com> References: <20140206092942.GC31780@elgon.mountain> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by gabe.freedesktop.org (Postfix) with ESMTP id 78F8DFB859 for ; Thu, 6 Feb 2014 21:37:11 -0800 (PST) In-Reply-To: <20140206092942.GC31780@elgon.mountain> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Dan Carpenter Cc: Martin Peres , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Dave Airlie List-Id: dri-devel@lists.freedesktop.org ----- Original Message ----- > From: "Dan Carpenter" > To: "David Airlie" > Cc: "Ben Skeggs" , "Martin Peres" , "Ilia Mirkin" , > "Dave Airlie" , dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org > Sent: Thursday, 6 February, 2014 7:29:43 PM > Subject: [patch] drm/nouveau/hwmon: remove some redundant checks > > No need to check "ret" twice in a row. > Got it. Thank you! > Signed-off-by: Dan Carpenter > > diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c > b/drivers/gpu/drm/nouveau/nouveau_hwmon.c > index 4aff04fa483c..5e4ab58f4f6b 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c > +++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c > @@ -587,18 +587,14 @@ nouveau_hwmon_init(struct drm_device *dev) > > /* set the default attributes */ > ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_default_attrgroup); > - if (ret) { > - if (ret) > - goto error; > - } > + if (ret) > + goto error; > > /* if the card has a working thermal sensor */ > if (therm->temp_get(therm) >= 0) { > ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_temp_attrgroup); > - if (ret) { > - if (ret) > - goto error; > - } > + if (ret) > + goto error; > } > > /* if the card has a pwm fan */ >