[PATCHv2 0/6] media: convert to c99 format

[PATCHv2 0/6] media: convert to c99 format

[Shubhrajyoti D]

The series tries to convert the i2c_msg to c99 struct.
This may avoid issues like below if someone tries to add an
element to the structure.
http://www.mail-archive.com/linux-i2c@vger.kernel.org/msg08972.html

Special thanks to Julia Lawall for helping it automate.
By the below script.
http://www.mail-archive.com/cocci@diku.dk/msg02753.html



Shubhrajyoti D (6):
  media: Convert struct i2c_msg initialization to C99 format
  media: Convert struct i2c_msg initialization to C99 format
  media: Convert struct i2c_msg initialization to C99 format
  media: Convert struct i2c_msg initialization to C99 format
  media: Convert struct i2c_msg initialization to C99 format
  media: Convert struct i2c_msg initialization to C99 format

 drivers/media/i2c/ks0127.c                    |   14 +++++++-
 drivers/media/i2c/msp3400-driver.c            |   42 +++++++++++++++++++++---
 drivers/media/i2c/tvaudio.c                   |   14 +++++++-
 drivers/media/radio/radio-tea5764.c           |   14 ++++++--
 drivers/media/radio/saa7706h.c                |   16 ++++++++-
 drivers/media/radio/si470x/radio-si470x-i2c.c |   24 ++++++++++---
 6 files changed, 103 insertions(+), 21 deletions(-)

-- 
1.7.5.4

[PATCHv2 1/6] media: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti D]

        Convert the struct i2c_msg initialization to C99 format. This makes
        maintaining and editing the code simpler. Also helps once other fields
        like transferred are added in future.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/media/i2c/ks0127.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c
index ee7ca2d..4ede64a 100644
--- a/drivers/media/i2c/ks0127.c
+++ b/drivers/media/i2c/ks0127.c
@@ -319,8 +319,18 @@ static u8 ks0127_read(struct v4l2_subdev *sd, u8 reg)
 	struct i2c_client *client = v4l2_get_subdevdata(sd);
 	char val = 0;
 	struct i2c_msg msgs[] = {
-		{ client->addr, 0, sizeof(reg), &reg },
-		{ client->addr, I2C_M_RD | I2C_M_NO_RD_ACK, sizeof(val), &val }
+		{
+			.addr = client->addr,
+			.flags = 0,
+			.len = sizeof(reg),
+			.buf = &reg
+		},
+		{
+			.addr = client->addr,
+			.flags = I2C_M_RD | I2C_M_NO_RD_ACK,
+			.len = sizeof(val),
+			.buf = &val
+		}
 	};
 	int ret;
 
-- 
1.7.5.4

[PATCHv2 2/6] media: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti D]

        Convert the struct i2c_msg initialization to C99 format. This makes
        maintaining and editing the code simpler. Also helps once other fields
        like transferred are added in future.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/media/i2c/tvaudio.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index 321b315..c9c1da3 100644
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -217,8 +217,18 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
 	unsigned char write[1];
 	unsigned char read[1];
 	struct i2c_msg msgs[2] = {
-		{ c->addr, 0,        1, write },
-		{ c->addr, I2C_M_RD, 1, read  }
+		{
+			.addr = c->addr,
+			.flags = 0,
+			.len = 1,
+			.buf = write
+		},
+		{
+			.addr = c->addr,
+			.flags = I2C_M_RD,
+			.len = 1,
+			.buf = read
+		}
 	};
 
 	write[0] = subaddr;
-- 
1.7.5.4

[PATCHv2 3/6] media: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti D]

        Convert the struct i2c_msg initialization to C99 format. This makes
        maintaining and editing the code simpler. Also helps once other fields
        like transferred are added in future.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/media/radio/radio-tea5764.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 6b1fae3..41de676 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -151,8 +151,11 @@ int tea5764_i2c_read(struct tea5764_device *radio)
 	u16 *p = (u16 *) &radio->regs;
 
 	struct i2c_msg msgs[1] = {
-		{ radio->i2c_client->addr, I2C_M_RD, sizeof(radio->regs),
-			(void *)&radio->regs },
+		{	.addr = radio->i2c_client->addr,
+			.flags = I2C_M_RD,
+			.len = sizeof(radio->regs),
+			.buf = (void *)&radio->regs
+		},
 	};
 	if (i2c_transfer(radio->i2c_client->adapter, msgs, 1) != 1)
 		return -EIO;
@@ -167,7 +170,12 @@ int tea5764_i2c_write(struct tea5764_device *radio)
 	struct tea5764_write_regs wr;
 	struct tea5764_regs *r = &radio->regs;
 	struct i2c_msg msgs[1] = {
-		{ radio->i2c_client->addr, 0, sizeof(wr), (void *) &wr },
+		{
+			.addr = radio->i2c_client->addr,
+			.flags = 0,
+			.len = sizeof(wr),
+			.buf = (void *)&wr
+		},
 	};
 	wr.intreg  = r->intreg & 0xff;
 	wr.frqset  = __cpu_to_be16(r->frqset);
-- 
1.7.5.4

[PATCHv2 4/6] media: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti D]

        Convert the struct i2c_msg initialization to C99 format. This makes
        maintaining and editing the code simpler. Also helps once other fields
        like transferred are added in future.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/media/radio/si470x/radio-si470x-i2c.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index f867f04..be2efb9 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -98,8 +98,12 @@ int si470x_get_register(struct si470x_device *radio, int regnr)
 {
 	u16 buf[READ_REG_NUM];
 	struct i2c_msg msgs[1] = {
-		{ radio->client->addr, I2C_M_RD, sizeof(u16) * READ_REG_NUM,
-			(void *)buf },
+		{
+			.addr = radio->client->addr,
+			.flags = I2C_M_RD,
+			.len = sizeof(u16) * READ_REG_NUM,
+			.buf = (void *)buf
+		},
 	};
 
 	if (i2c_transfer(radio->client->adapter, msgs, 1) != 1)
@@ -119,8 +123,12 @@ int si470x_set_register(struct si470x_device *radio, int regnr)
 	int i;
 	u16 buf[WRITE_REG_NUM];
 	struct i2c_msg msgs[1] = {
-		{ radio->client->addr, 0, sizeof(u16) * WRITE_REG_NUM,
-			(void *)buf },
+		{
+			.addr = radio->client->addr,
+			.flags = 0,
+			.len = sizeof(u16) * WRITE_REG_NUM,
+			.buf = (void *)buf
+		},
 	};
 
 	for (i = 0; i < WRITE_REG_NUM; i++)
@@ -146,8 +154,12 @@ static int si470x_get_all_registers(struct si470x_device *radio)
 	int i;
 	u16 buf[READ_REG_NUM];
 	struct i2c_msg msgs[1] = {
-		{ radio->client->addr, I2C_M_RD, sizeof(u16) * READ_REG_NUM,
-			(void *)buf },
+		{
+			.addr = radio->client->addr,
+			.flags = I2C_M_RD,
+			.len = sizeof(u16) * READ_REG_NUM,
+			.buf = (void *)buf
+		},
 	};
 
 	if (i2c_transfer(radio->client->adapter, msgs, 1) != 1)
-- 
1.7.5.4

[PATCHv2 5/6] media: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti D]

        Convert the struct i2c_msg initialization to C99 format. This makes
        maintaining and editing the code simpler. Also helps once other fields
        like transferred are added in future.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/media/radio/saa7706h.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index bb953ef..97cf867 100644
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -199,8 +199,20 @@ static int saa7706h_get_reg16(struct v4l2_subdev *sd, u16 reg)
 	u8 buf[2];
 	int err;
 	u8 regaddr[] = {reg >> 8, reg};
-	struct i2c_msg msg[] = { {client->addr, 0, sizeof(regaddr), regaddr},
-				{client->addr, I2C_M_RD, sizeof(buf), buf} };
+	struct i2c_msg msg[] = {
+					{
+						.addr = client->addr,
+						.flags = 0,
+						.len = sizeof(regaddr),
+						.buf = regaddr
+					},
+					{
+						.addr = client->addr,
+						.flags = I2C_M_RD,
+						.len = sizeof(buf),
+						.buf = buf
+					}
+				};
 
 	err = saa7706h_i2c_transfer(client, msg, ARRAY_SIZE(msg));
 	if (err)
-- 
1.7.5.4

[PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti D]

        Convert the struct i2c_msg initialization to C99 format. This makes
        maintaining and editing the code simpler. Also helps once other fields
        like transferred are added in future.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/media/i2c/msp3400-driver.c |   42 ++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index aeb22be..b8cef8d 100644
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -119,12 +119,32 @@ int msp_reset(struct i2c_client *client)
 	static u8 write[3]     = { I2C_MSP_DSP + 1, 0x00, 0x1e };
 	u8 read[2];
 	struct i2c_msg reset[2] = {
-		{ client->addr, I2C_M_IGNORE_NAK, 3, reset_off },
-		{ client->addr, I2C_M_IGNORE_NAK, 3, reset_on  },
+		{
+			.addr = client->addr,
+			.flags = I2C_M_IGNORE_NAK,
+			.len = 3,
+			.buf = reset_off
+		},
+		{
+			.addr = client->addr,
+			.flags = I2C_M_IGNORE_NAK,
+			.len = 3,
+			.buf = reset_on
+		},
 	};
 	struct i2c_msg test[2] = {
-		{ client->addr, 0,        3, write },
-		{ client->addr, I2C_M_RD, 2, read  },
+		{
+			.addr = client->addr,
+			.flags = 0,
+			.len = 3,
+			.buf = write
+		},
+		{
+			.addr = client->addr,
+			.flags = I2C_M_RD,
+			.len = 2,
+			.buf = read
+		},
 	};
 
 	v4l_dbg(3, msp_debug, client, "msp_reset\n");
@@ -143,8 +163,18 @@ static int msp_read(struct i2c_client *client, int dev, int addr)
 	u8 write[3];
 	u8 read[2];
 	struct i2c_msg msgs[2] = {
-		{ client->addr, 0,        3, write },
-		{ client->addr, I2C_M_RD, 2, read  }
+		{
+			.addr = client->addr,
+			.flags = 0,
+			.len = 3,
+			.buf = write
+		},
+		{
+			.addr = client->addr,
+			.flags = I2C_M_RD,
+			.len = 2,
+			.buf = read
+		}
 	};
 
 	write[0] = dev + 1;
-- 
1.7.5.4

RE: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99 format

[Venu Byravarasu]

> -----Original Message-----
> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-
> owner@vger.kernel.org] On Behalf Of Shubhrajyoti D
> Sent: Tuesday, September 18, 2012 3:21 PM
> To: linux-media@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org; julia.lawall@lip6.fr; Shubhrajyoti D
> Subject: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99
> format
> 
>         Convert the struct i2c_msg initialization to C99 format. This makes
>         maintaining and editing the code simpler. Also helps once other fields
>         like transferred are added in future.
> 
> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
> ---
>  drivers/media/i2c/msp3400-driver.c |   42
> ++++++++++++++++++++++++++++++-----
>  1 files changed, 36 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/i2c/msp3400-driver.c
> b/drivers/media/i2c/msp3400-driver.c
> index aeb22be..b8cef8d 100644
> --- a/drivers/media/i2c/msp3400-driver.c
> +++ b/drivers/media/i2c/msp3400-driver.c
> @@ -119,12 +119,32 @@ int msp_reset(struct i2c_client *client)
>  	static u8 write[3]     = { I2C_MSP_DSP + 1, 0x00, 0x1e };
>  	u8 read[2];
>  	struct i2c_msg reset[2] = {
> -		{ client->addr, I2C_M_IGNORE_NAK, 3, reset_off },
> -		{ client->addr, I2C_M_IGNORE_NAK, 3, reset_on  },
> +		{
> +			.addr = client->addr,
> +			.flags = I2C_M_IGNORE_NAK,
> +			.len = 3,
> +			.buf = reset_off
> +		},
> +		{
> +			.addr = client->addr,
> +			.flags = I2C_M_IGNORE_NAK,
> +			.len = 3,
> +			.buf = reset_on
> +		},
>  	};
>  	struct i2c_msg test[2] = {
> -		{ client->addr, 0,        3, write },
> -		{ client->addr, I2C_M_RD, 2, read  },
> +		{
> +			.addr = client->addr,
> +			.flags = 0,

Does flags not contain 0 by default?
 

> +			.len = 3,
> +			.buf = write
> +		},
> +		{
> +			.addr = client->addr,
> +			.flags = I2C_M_RD,
> +			.len = 2,
> +			.buf = read
> +		},
>  	};
> 
>  	v4l_dbg(3, msp_debug, client, "msp_reset\n");
> @@ -143,8 +163,18 @@ static int msp_read(struct i2c_client *client, int dev,
> int addr)
>  	u8 write[3];
>  	u8 read[2];
>  	struct i2c_msg msgs[2] = {
> -		{ client->addr, 0,        3, write },
> -		{ client->addr, I2C_M_RD, 2, read  }
> +		{
> +			.addr = client->addr,
> +			.flags = 0,
> +			.len = 3,
> +			.buf = write
> +		},
> +		{
> +			.addr = client->addr,
> +			.flags = I2C_M_RD,
> +			.len = 2,
> +			.buf = read
> +		}
>  	};
> 
>  	write[0] = dev + 1;
> --
> 1.7.5.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti Datta]

On Tue, Sep 18, 2012 at 3:26 PM, Venu Byravarasu <vbyravarasu@nvidia.com> wrote:
>> -----Original Message-----
>> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-
>> owner@vger.kernel.org] On Behalf Of Shubhrajyoti D
>> Sent: Tuesday, September 18, 2012 3:21 PM
>> To: linux-media@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org; julia.lawall@lip6.fr; Shubhrajyoti D
>> Subject: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99
>> format
>>
>>         Convert the struct i2c_msg initialization to C99 format. This makes
>>         maintaining and editing the code simpler. Also helps once other fields
>>         like transferred are added in future.
>>
>> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
>> ---
>>  drivers/media/i2c/msp3400-driver.c |   42
>> ++++++++++++++++++++++++++++++-----
>>  1 files changed, 36 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/media/i2c/msp3400-driver.c
>> b/drivers/media/i2c/msp3400-driver.c
>> index aeb22be..b8cef8d 100644
>> --- a/drivers/media/i2c/msp3400-driver.c
>> +++ b/drivers/media/i2c/msp3400-driver.c
>> @@ -119,12 +119,32 @@ int msp_reset(struct i2c_client *client)
>>       static u8 write[3]     = { I2C_MSP_DSP + 1, 0x00, 0x1e };
>>       u8 read[2];
>>       struct i2c_msg reset[2] = {
>> -             { client->addr, I2C_M_IGNORE_NAK, 3, reset_off },
>> -             { client->addr, I2C_M_IGNORE_NAK, 3, reset_on  },
>> +             {
>> +                     .addr = client->addr,
>> +                     .flags = I2C_M_IGNORE_NAK,
>> +                     .len = 3,
>> +                     .buf = reset_off
>> +             },
>> +             {
>> +                     .addr = client->addr,
>> +                     .flags = I2C_M_IGNORE_NAK,
>> +                     .len = 3,
>> +                     .buf = reset_on
>> +             },
>>       };
>>       struct i2c_msg test[2] = {
>> -             { client->addr, 0,        3, write },
>> -             { client->addr, I2C_M_RD, 2, read  },
>> +             {
>> +                     .addr = client->addr,
>> +                     .flags = 0,
>
> Does flags not contain 0 by default?
>

It does however I felt that 0 means write so letting it be explicit.

In case a removal is preferred that's doable too however felt it is
more readable this way.

Re: [PATCHv2 0/6] media: convert to c99 format

[Hans Verkuil]

On Tue 18 September 2012 11:50:37 Shubhrajyoti D wrote:
> The series tries to convert the i2c_msg to c99 struct.
> This may avoid issues like below if someone tries to add an
> element to the structure.
> http://www.mail-archive.com/linux-i2c@vger.kernel.org/msg08972.html
> 
> Special thanks to Julia Lawall for helping it automate.
> By the below script.
> http://www.mail-archive.com/cocci@diku.dk/msg02753.html

That looks much better.

For the whole series:

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

Regards,

	Hans

> 
> 
> 
> Shubhrajyoti D (6):
>   media: Convert struct i2c_msg initialization to C99 format
>   media: Convert struct i2c_msg initialization to C99 format
>   media: Convert struct i2c_msg initialization to C99 format
>   media: Convert struct i2c_msg initialization to C99 format
>   media: Convert struct i2c_msg initialization to C99 format
>   media: Convert struct i2c_msg initialization to C99 format
> 
>  drivers/media/i2c/ks0127.c                    |   14 +++++++-
>  drivers/media/i2c/msp3400-driver.c            |   42 +++++++++++++++++++++---
>  drivers/media/i2c/tvaudio.c                   |   14 +++++++-
>  drivers/media/radio/radio-tea5764.c           |   14 ++++++--
>  drivers/media/radio/saa7706h.c                |   16 ++++++++-
>  drivers/media/radio/si470x/radio-si470x-i2c.c |   24 ++++++++++---
>  6 files changed, 103 insertions(+), 21 deletions(-)
> 
> 

RE: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99 format

[Venu Byravarasu]

> -----Original Message-----
> From: Shubhrajyoti Datta [mailto:omaplinuxkernel@gmail.com]
> Sent: Tuesday, September 18, 2012 3:30 PM
> To: Venu Byravarasu
> Cc: Shubhrajyoti D; linux-media@vger.kernel.org; linux-
> kernel@vger.kernel.org; julia.lawall@lip6.fr
> Subject: Re: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99
> format

> >>       struct i2c_msg test[2] = {
> >> -             { client->addr, 0,        3, write },
> >> -             { client->addr, I2C_M_RD, 2, read  },
> >> +             {
> >> +                     .addr = client->addr,
> >> +                     .flags = 0,
> >
> > Does flags not contain 0 by default?
> >
> 
> It does however I felt that 0 means write so letting it be explicit.
> 
> In case a removal is preferred that's doable too however felt it is
> more readable this way.

Though it adds readability, it carries an overhead of one write operation too.
So, better to remove it.
 

Re: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99 format

[Cody P Schafer]

On Tue 18 Sep 2012 03:02:42 AM PDT, Venu Byravarasu wrote:
>> -----Original Message-----
>> From: Shubhrajyoti Datta [mailto:omaplinuxkernel@gmail.com]
>> Sent: Tuesday, September 18, 2012 3:30 PM
>> To: Venu Byravarasu
>> Cc: Shubhrajyoti D; linux-media@vger.kernel.org; linux-
>> kernel@vger.kernel.org; julia.lawall@lip6.fr
>> Subject: Re: [PATCHv2 6/6] media: Convert struct i2c_msg initialization to C99
>> format
>
>>>>        struct i2c_msg test[2] = {
>>>> -             { client->addr, 0,        3, write },
>>>> -             { client->addr, I2C_M_RD, 2, read  },
>>>> +             {
>>>> +                     .addr = client->addr,
>>>> +                     .flags = 0,
>>>
>>> Does flags not contain 0 by default?
>>>
>>
>> It does however I felt that 0 means write so letting it be explicit.
>>
>> In case a removal is preferred that's doable too however felt it is
>> more readable this way.
>
> Though it adds readability, it carries an overhead of one write operation too.
> So, better to remove it.

Partially initialized structs will have their unmentioned members 
initialized to zero.

So there is no "overhead of one write operation" by mentioning it 
explicitly.