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

[PATCHv3 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

Changelogs
- Remove the zero inititialisation of the flags.

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                    |   13 +++++++-
 drivers/media/i2c/msp3400-driver.c            |   40 +++++++++++++++++++++----
 drivers/media/i2c/tvaudio.c                   |   13 +++++++-
 drivers/media/radio/radio-tea5764.c           |   13 ++++++--
 drivers/media/radio/saa7706h.c                |   15 ++++++++-
 drivers/media/radio/si470x/radio-si470x-i2c.c |   23 ++++++++++----
 6 files changed, 96 insertions(+), 21 deletions(-)

-- 
1.7.5.4

[PATCHv3 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 |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c
index ee7ca2d..04a6efa 100644
--- a/drivers/media/i2c/ks0127.c
+++ b/drivers/media/i2c/ks0127.c
@@ -319,8 +319,17 @@ 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,
+			.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

[PATCHv3 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 |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index 321b315..f74a3f9 100644
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -217,8 +217,17 @@ 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,
+			.len = 1,
+			.buf = write
+		},
+		{
+			.addr = c->addr,
+			.flags = I2C_M_RD,
+			.len = 1,
+			.buf = read
+		}
 	};
 
 	write[0] = subaddr;
-- 
1.7.5.4

[PATCHv3 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 |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 6b1fae3..52a34b1 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,11 @@ 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,
+			.len = sizeof(wr),
+			.buf = (void *)&wr
+		},
 	};
 	wr.intreg  = r->intreg & 0xff;
 	wr.frqset  = __cpu_to_be16(r->frqset);
-- 
1.7.5.4

[PATCHv3 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/i2c/msp3400-driver.c |   40 ++++++++++++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index aeb22be..766305f 100644
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -119,12 +119,31 @@ 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,
+			.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 +162,17 @@ 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,
+			.len = 3,
+			.buf = write
+		},
+		{
+			.addr = client->addr,
+			.flags = I2C_M_RD,
+			.len = 2,
+			.buf = read
+		}
 	};
 
 	write[0] = dev + 1;
-- 
1.7.5.4

[PATCHv3 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 |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index bb953ef..54db36c 100644
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -199,8 +199,19 @@ 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,
+						.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

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

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1688 bytes --]

On Tue, Sep 18, 2012 at 05:14:31PM +0530, Shubhrajyoti D wrote:
>         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.

no need for these tabs here.

FWIW:

Reviewed-by: Felipe Balbi <balbi@ti.com>

> 
> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
> ---
>  drivers/media/radio/saa7706h.c |   15 +++++++++++++--
>  1 files changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
> index bb953ef..54db36c 100644
> --- a/drivers/media/radio/saa7706h.c
> +++ b/drivers/media/radio/saa7706h.c
> @@ -199,8 +199,19 @@ 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,
> +						.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
> 
> --
> 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/

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

[Shubhrajyoti]

On Tuesday 18 September 2012 05:12 PM, Felipe Balbi wrote:
> On Tue, Sep 18, 2012 at 05:14:31PM +0530, Shubhrajyoti D wrote:
>> >         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.
> no need for these tabs here.
yep will fix and repost thanks.

> FWIW:
>
> Reviewed-by: Felipe Balbi <balbi@ti.com>
thanks for the review

[PATCHv3 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/radio/si470x/radio-si470x-i2c.c |   23 +++++++++++++++++------
 1 files changed, 17 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..e5024cf 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,11 @@ 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,
+			.len = sizeof(u16) * WRITE_REG_NUM,
+			.buf = (void *)buf
+		},
 	};
 
 	for (i = 0; i < WRITE_REG_NUM; i++)
@@ -146,8 +153,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

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

[Ezequiel Garcia]

Shubhrajyoti,

Thanks for your patches.

I'm adding media maintainer (Mauro) in Cc. When you send
patches for a file you should check who maintains them
and put those people in Cc.

This is really easy with get_maintainer.pl. You can also
check with git log / git blame to see who has been working
on that file.

You should read Documentation/SubmittingPatches
if you haven't already (and read it again if you already have ;-)

On Tue, Sep 18, 2012 at 8:44 AM, Shubhrajyoti D <shubhrajyoti@ti.com> 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
>
> Changelogs
> - Remove the zero inititialisation of the flags.
>
> 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
>

IMO, sending several different patches with the same commit
subject is not the best thing to do.

Perhaps this is too much to ask, but I'd prefer something
like:

media: saa7706h: Convert struct i2c_msg initialization to C99 format

>  drivers/media/i2c/ks0127.c                    |   13 +++++++-
>  drivers/media/i2c/msp3400-driver.c            |   40 +++++++++++++++++++++----
>  drivers/media/i2c/tvaudio.c                   |   13 +++++++-
>  drivers/media/radio/radio-tea5764.c           |   13 ++++++--
>  drivers/media/radio/saa7706h.c                |   15 ++++++++-
>  drivers/media/radio/si470x/radio-si470x-i2c.c |   23 ++++++++++----
>  6 files changed, 96 insertions(+), 21 deletions(-)
>

Thanks!
Ezequiel.

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

[Mauro Carvalho Chehab]

Em Ter, 2012-09-25 às 08:03 -0300, Ezequiel Garcia escreveu:
> Shubhrajyoti,
> 
> Thanks for your patches.
> 
> I'm adding media maintainer (Mauro) in Cc. When you send
> patches for a file you should check who maintains them
> and put those people in Cc.

I actually prefer to not be c/c on the patches ;) Copying the
linux-media mailing list and checking if the patch was caught by
patchwork.linuxtv.kernel.org is enough, as I rely on patchwork to
queue patches for me. So, I just discard any media patch sent to me
directly.

> 
> This is really easy with get_maintainer.pl. You can also
> check with git log / git blame to see who has been working
> on that file.
> 
> You should read Documentation/SubmittingPatches
> if you haven't already (and read it again if you already have ;-)
> 
> On Tue, Sep 18, 2012 at 8:44 AM, Shubhrajyoti D <shubhrajyoti@ti.com> 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
> >
> > Changelogs
> > - Remove the zero inititialisation of the flags.
> >
> > 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
> >
> 
> IMO, sending several different patches with the same commit
> subject is not the best thing to do.
> 
> Perhaps this is too much to ask, but I'd prefer something
> like:
> 
> media: saa7706h: Convert struct i2c_msg initialization to C99 format
> 
> >  drivers/media/i2c/ks0127.c                    |   13 +++++++-
> >  drivers/media/i2c/msp3400-driver.c            |   40 +++++++++++++++++++++----
> >  drivers/media/i2c/tvaudio.c                   |   13 +++++++-
> >  drivers/media/radio/radio-tea5764.c           |   13 ++++++--
> >  drivers/media/radio/saa7706h.c                |   15 ++++++++-
> >  drivers/media/radio/si470x/radio-si470x-i2c.c |   23 ++++++++++----
> >  6 files changed, 96 insertions(+), 21 deletions(-)
> >
> 
> Thanks!
> Ezequiel.

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

[Ezequiel Garcia]

On Tue, Sep 25, 2012 at 8:09 AM, Mauro Carvalho Chehab
<mchehab@redhat.com> wrote:
> Em Ter, 2012-09-25 às 08:03 -0300, Ezequiel Garcia escreveu:
>> Shubhrajyoti,
>>
>> Thanks for your patches.
>>
>> I'm adding media maintainer (Mauro) in Cc. When you send
>> patches for a file you should check who maintains them
>> and put those people in Cc.
>
> I actually prefer to not be c/c on the patches ;) Copying the
> linux-media mailing list and checking if the patch was caught by
> patchwork.linuxtv.kernel.org is enough, as I rely on patchwork to
> queue patches for me. So, I just discard any media patch sent to me
> directly.
>

Ouch! I didn't know that!

Thanks for the information,
Ezequiel.