| Message ID | 1349782668-9098-1-git-send-email-shubhrajyoti@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 9 Oct 2012 17:07:48 +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. > > Thanks to Julia Lawall <julia.lawall@lip6.fr> for automating the conversion > > Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> > --- > drivers/video/matrox/matroxfb_maven.c | 15 +++++++++++++-- > 1 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c > index 217678e..fb5c123 100644 > --- a/drivers/video/matrox/matroxfb_maven.c > +++ b/drivers/video/matrox/matroxfb_maven.c > @@ -137,8 +137,19 @@ static int* get_ctrl_ptr(struct maven_data* md, int idx) { > > static int maven_get_reg(struct i2c_client* c, char reg) { > char dst; > - struct i2c_msg msgs[] = {{ c->addr, I2C_M_REV_DIR_ADDR, sizeof(reg), ® }, > - { c->addr, I2C_M_RD | I2C_M_NOSTART, sizeof(dst), &dst }}; > + struct i2c_msg msgs[] = {{ > + .addr = c->addr, > + .flags = I2C_M_REV_DIR_ADDR, > + .len = sizeof(reg), > + .buf = ® > + }, > + { > + .addr = c->addr, > + .flags = I2C_M_RD | I2C_M_NOSTART, > + .len = sizeof(dst), > + .buf = &dst > + } I'd prefer clean indentation as you have in the previous patches. > + }; > s32 err; > > err = i2c_transfer(c->adapter, msgs, 2); Acked-by: Jean Delvare <khali@linux-fr.org>
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 217678e..fb5c123 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c @@ -137,8 +137,19 @@ static int* get_ctrl_ptr(struct maven_data* md, int idx) { static int maven_get_reg(struct i2c_client* c, char reg) { char dst; - struct i2c_msg msgs[] = {{ c->addr, I2C_M_REV_DIR_ADDR, sizeof(reg), ® }, - { c->addr, I2C_M_RD | I2C_M_NOSTART, sizeof(dst), &dst }}; + struct i2c_msg msgs[] = {{ + .addr = c->addr, + .flags = I2C_M_REV_DIR_ADDR, + .len = sizeof(reg), + .buf = ® + }, + { + .addr = c->addr, + .flags = I2C_M_RD | I2C_M_NOSTART, + .len = sizeof(dst), + .buf = &dst + } + }; s32 err; err = i2c_transfer(c->adapter, msgs, 2);
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. Thanks to Julia Lawall <julia.lawall@lip6.fr> for automating the conversion Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> --- drivers/video/matrox/matroxfb_maven.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-)