[PATCH 0/6] media: input: convert to c99 format

[PATCH 0/6] media: input: 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

Checkpatch warn of more than 80 chars have been ignored.

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

-- 
1.7.5.4

[PATCH 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 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index aeb22be..9c9f014 100644
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -119,12 +119,12 @@ 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 +143,8 @@ 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

[PATCH 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/i2c/tvaudio.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index 321b315..2a9fdc7 100644
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -217,8 +217,8 @@ 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

[PATCH 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/radio-tea5764.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 6b1fae3..5dbe12e 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -151,8 +151,8 @@ 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 +167,7 @@ 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

[PATCH 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 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

[PATCH 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 |   12 ++++++------
 1 files changed, 6 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..949885e 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -98,8 +98,8 @@ 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 +119,8 @@ 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 +146,8 @@ 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: [PATCH 0/6] media: input: convert to c99 format

[Hans Verkuil]

On Mon September 17 2012 17:22:27 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

I'm OK with this provided that these intializations are formatted with
one field per line. It's rather hard to read otherwise since the lines
are now a lot longer.

Regards,

	Hans

> Special thanks to Julia Lawall for helping it automate.
> By the below script.
> http://www.mail-archive.com/cocci@diku.dk/msg02753.html
> 
> Checkpatch warn of more than 80 chars have been ignored.
> 
> 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                    |    4 ++--
>  drivers/media/i2c/msp3400-driver.c            |   12 ++++++------
>  drivers/media/i2c/tvaudio.c                   |    4 ++--
>  drivers/media/radio/radio-tea5764.c           |    6 +++---
>  drivers/media/radio/saa7706h.c                |    4 ++--
>  drivers/media/radio/si470x/radio-si470x-i2c.c |   12 ++++++------
>  6 files changed, 21 insertions(+), 21 deletions(-)
> 
>