diff options
author | Shubhrajyoti Datta <omaplinuxkernel@gmail.com> | 2013-04-29 18:05:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:54:26 -0400 |
commit | 86fa05e00eeefbda50e3ed6dd0a915e24964526b (patch) | |
tree | 3ce3d4238a0dcf8830fbde9fb8b248882b382bdf | |
parent | 12b2f117f3bf738c1a00a6f64393f1953a740bd4 (diff) |
matroxfb: 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.
Thanks to Julia Lawall for automating the conversion.
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Julia Lawall <julia@diku.dk>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/matrox/matroxfb_maven.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 217678e0b983..fd2897455696 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c | |||
@@ -137,8 +137,20 @@ static int* get_ctrl_ptr(struct maven_data* md, int idx) { | |||
137 | 137 | ||
138 | static int maven_get_reg(struct i2c_client* c, char reg) { | 138 | static int maven_get_reg(struct i2c_client* c, char reg) { |
139 | char dst; | 139 | char dst; |
140 | struct i2c_msg msgs[] = {{ c->addr, I2C_M_REV_DIR_ADDR, sizeof(reg), ® }, | 140 | struct i2c_msg msgs[] = { |
141 | { c->addr, I2C_M_RD | I2C_M_NOSTART, sizeof(dst), &dst }}; | 141 | { |
142 | .addr = c->addr, | ||
143 | .flags = I2C_M_REV_DIR_ADDR, | ||
144 | .len = sizeof(reg), | ||
145 | .buf = ® | ||
146 | }, | ||
147 | { | ||
148 | .addr = c->addr, | ||
149 | .flags = I2C_M_RD | I2C_M_NOSTART, | ||
150 | .len = sizeof(dst), | ||
151 | .buf = &dst | ||
152 | } | ||
153 | }; | ||
142 | s32 err; | 154 | s32 err; |
143 | 155 | ||
144 | err = i2c_transfer(c->adapter, msgs, 2); | 156 | err = i2c_transfer(c->adapter, msgs, 2); |