[patch] drm/nouveau/hwmon: remove some redundant checks

Ben Skeggs bskeggs at redhat.com
Thu Feb 6 21:37:05 PST 2014


----- Original Message -----
> From: "Dan Carpenter" <dan.carpenter at oracle.com>
> To: "David Airlie" <airlied at linux.ie>
> Cc: "Ben Skeggs" <bskeggs at redhat.com>, "Martin Peres" <martin.peres at labri.fr>, "Ilia Mirkin" <imirkin at alum.mit.edu>,
> "Dave Airlie" <airlied at redhat.com>, dri-devel at lists.freedesktop.org, kernel-janitors at 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 <dan.carpenter at oracle.com>
> 
> 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 */
> 


More information about the dri-devel mailing list