[PATCH 2/2] i2c.c: Fixed coding style issue for if statement

Joe Perches joe at perches.com
Sat Jul 27 10:53:20 PDT 2013


On Sat, 2013-07-27 at 23:18 +0530, santosh.anbu wrote:
> From: "santosh.anbu" <asantosh.king at gmail.com>
[]
> diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c b/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c
> index cfb9288..e88529c 100644
> --- a/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c
> +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c
> @@ -114,15 +114,19 @@ dcb_i2c_parse(struct nouveau_bios *bios, u8 idx, struct dcb_i2c_entry *info)
>  
>  		if (idx == 0) {
>  			info->drive = nv_ro08(bios, ent + 4);
> -			if (!info->drive) info->drive = 0x3f;
> +			if (!info->drive)
> +				info->drive = 0x3f;
>  			info->sense = nv_ro08(bios, ent + 5);
> -			if (!info->sense) info->sense = 0x3e;
> +			if (!info->sense)
> +				info->sense = 0x3e;
>  		} else
>  		if (idx == 1) {
>  			info->drive = nv_ro08(bios, ent + 6);
> -			if (!info->drive) info->drive = 0x37;
> +			if (!info->drive)
> +				info->drive = 0x37;
>  			info->sense = nv_ro08(bios, ent + 7);
> -			if (!info->sense) info->sense = 0x36;
> +			if (!info->sense)
> +				info->sense = 0x36;
>  		}
>  
>  		info->type  = DCB_I2C_NV04_BIT;

Perhaps this is better handled with a new function like

int nv_ro08_default(bios, address, default)
{
	int val = nv_ro08(bios, address);
	if (val == 0)
		val = default;
	return val;
}



More information about the dri-devel mailing list