* [PATCHv4 0/6] media: convert to c99 format
@ 2012-09-18 12:22 Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 1/6] media: Convert struct i2c_msg initialization to C99 format Shubhrajyoti D
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Shubhrajyoti D @ 2012-09-18 12:22 UTC (permalink / raw)
To: linux-media; +Cc: linux-kernel, julia.lawall, 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCHv4 1/6] media: Convert struct i2c_msg initialization to C99 format
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
@ 2012-09-18 12:22 ` Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 2/6] " Shubhrajyoti D
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shubhrajyoti D @ 2012-09-18 12:22 UTC (permalink / raw)
To: linux-media; +Cc: linux-kernel, julia.lawall, 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), ® },
- { client->addr, I2C_M_RD | I2C_M_NO_RD_ACK, sizeof(val), &val }
+ {
+ .addr = client->addr,
+ .len = sizeof(reg),
+ .buf = ®
+ },
+ {
+ .addr = client->addr,
+ .flags = I2C_M_RD | I2C_M_NO_RD_ACK,
+ .len = sizeof(val),
+ .buf = &val
+ }
};
int ret;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 2/6] media: Convert struct i2c_msg initialization to C99 format
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 1/6] media: Convert struct i2c_msg initialization to C99 format Shubhrajyoti D
@ 2012-09-18 12:22 ` Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 3/6] " Shubhrajyoti D
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shubhrajyoti D @ 2012-09-18 12:22 UTC (permalink / raw)
To: linux-media; +Cc: linux-kernel, julia.lawall, 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 3/6] media: Convert struct i2c_msg initialization to C99 format
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 1/6] media: Convert struct i2c_msg initialization to C99 format Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 2/6] " Shubhrajyoti D
@ 2012-09-18 12:22 ` Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 4/6] " Shubhrajyoti D
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shubhrajyoti D @ 2012-09-18 12:22 UTC (permalink / raw)
To: linux-media; +Cc: linux-kernel, julia.lawall, 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 4/6] media: Convert struct i2c_msg initialization to C99 format
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
` (2 preceding siblings ...)
2012-09-18 12:22 ` [PATCHv4 3/6] " Shubhrajyoti D
@ 2012-09-18 12:22 ` Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 5/6] " Shubhrajyoti D
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shubhrajyoti D @ 2012-09-18 12:22 UTC (permalink / raw)
To: linux-media; +Cc: linux-kernel, julia.lawall, 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 5/6] media: Convert struct i2c_msg initialization to C99 format
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
` (3 preceding siblings ...)
2012-09-18 12:22 ` [PATCHv4 4/6] " Shubhrajyoti D
@ 2012-09-18 12:22 ` Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 6/6] " Shubhrajyoti D
2012-09-24 6:06 ` [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti
6 siblings, 0 replies; 8+ messages in thread
From: Shubhrajyoti D @ 2012-09-18 12:22 UTC (permalink / raw)
To: linux-media; +Cc: linux-kernel, julia.lawall, 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 6/6] media: Convert struct i2c_msg initialization to C99 format
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
` (4 preceding siblings ...)
2012-09-18 12:22 ` [PATCHv4 5/6] " Shubhrajyoti D
@ 2012-09-18 12:22 ` Shubhrajyoti D
2012-09-24 6:06 ` [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti
6 siblings, 0 replies; 8+ messages in thread
From: Shubhrajyoti D @ 2012-09-18 12:22 UTC (permalink / raw)
To: linux-media; +Cc: linux-kernel, julia.lawall, 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCHv4 0/6] media: convert to c99 format
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
` (5 preceding siblings ...)
2012-09-18 12:22 ` [PATCHv4 6/6] " Shubhrajyoti D
@ 2012-09-24 6:06 ` Shubhrajyoti
6 siblings, 0 replies; 8+ messages in thread
From: Shubhrajyoti @ 2012-09-24 6:06 UTC (permalink / raw)
To: Shubhrajyoti D; +Cc: linux-media, linux-kernel, julia.lawall
On Tuesday 18 September 2012 05:52 PM, 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
>
> Changelogs
> - Remove the zero inititialisation of the flags.
ping.
> 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(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-09-24 6:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-18 12:22 [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 1/6] media: Convert struct i2c_msg initialization to C99 format Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 2/6] " Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 3/6] " Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 4/6] " Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 5/6] " Shubhrajyoti D
2012-09-18 12:22 ` [PATCHv4 6/6] " Shubhrajyoti D
2012-09-24 6:06 ` [PATCHv4 0/6] media: convert to c99 format Shubhrajyoti
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).