From patchwork Mon Sep 17 13:58:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [7/7] rtc: Convert struct i2c_msg initialization to C99 format From: "Datta, Shubhrajyoti" X-Patchwork-Id: 184413 Message-Id: <1347890294-28467-8-git-send-email-shubhrajyoti@ti.com> To: Cc: , , Shubhrajyoti D Date: Mon, 17 Sep 2012 19:28:14 +0530 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 --- drivers/rtc/rtc-x1205.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c index 403b3d4..4ddd9a6 100644 --- a/drivers/rtc/rtc-x1205.c +++ b/drivers/rtc/rtc-x1205.c @@ -97,8 +97,8 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, int i; struct i2c_msg msgs[] = { - { client->addr, 0, 2, dt_addr }, /* setup read ptr */ - { client->addr, I2C_M_RD, 8, buf }, /* read date */ + { .addr = client->addr, .flags = 0, .len = 2, .buf = dt_addr }, /* setup read ptr */ + { .addr = client->addr, .flags = I2C_M_RD, .len = 8, .buf = buf }, /* read date */ }; /* read date registers */ @@ -142,8 +142,8 @@ static int x1205_get_status(struct i2c_client *client, unsigned char *sr) static unsigned char sr_addr[2] = { 0, X1205_REG_SR }; struct i2c_msg msgs[] = { - { client->addr, 0, 2, sr_addr }, /* setup read ptr */ - { client->addr, I2C_M_RD, 1, sr }, /* read status */ + { .addr = client->addr, .flags = 0, .len = 2, .buf = sr_addr }, /* setup read ptr */ + { .addr = client->addr, .flags = I2C_M_RD, .len = 1, .buf = sr }, /* read status */ }; /* read status register */ @@ -279,8 +279,8 @@ static int x1205_get_dtrim(struct i2c_client *client, int *trim) static unsigned char dtr_addr[2] = { 0, X1205_REG_DTR }; struct i2c_msg msgs[] = { - { client->addr, 0, 2, dtr_addr }, /* setup read ptr */ - { client->addr, I2C_M_RD, 1, &dtr }, /* read dtr */ + { .addr = client->addr, .flags = 0, .len = 2, .buf = dtr_addr }, /* setup read ptr */ + { .addr = client->addr, .flags = I2C_M_RD, .len = 1, .buf = &dtr }, /* read dtr */ }; /* read dtr register */ @@ -311,8 +311,8 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim) static unsigned char atr_addr[2] = { 0, X1205_REG_ATR }; struct i2c_msg msgs[] = { - { client->addr, 0, 2, atr_addr }, /* setup read ptr */ - { client->addr, I2C_M_RD, 1, &atr }, /* read atr */ + { .addr = client->addr, .flags = 0, .len = 2, .buf = atr_addr }, /* setup read ptr */ + { .addr = client->addr, .flags = I2C_M_RD, .len = 1, .buf = &atr }, /* read atr */ }; /* read atr register */ @@ -381,8 +381,8 @@ static int x1205_validate_client(struct i2c_client *client) unsigned char addr[2] = { 0, probe_zero_pattern[i] }; struct i2c_msg msgs[2] = { - { client->addr, 0, 2, addr }, - { client->addr, I2C_M_RD, 1, &buf }, + { .addr = client->addr, .flags = 0, .len = 2, .buf = addr }, + { .addr = client->addr, .flags = I2C_M_RD, .len = 1, .buf = &buf }, }; if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { @@ -409,8 +409,8 @@ static int x1205_validate_client(struct i2c_client *client) unsigned char addr[2] = { 0, probe_limits_pattern[i].reg }; struct i2c_msg msgs[2] = { - { client->addr, 0, 2, addr }, - { client->addr, I2C_M_RD, 1, ® }, + { .addr = client->addr, .flags = 0, .len = 2, .buf = addr }, + { .addr = client->addr, .flags = I2C_M_RD, .len = 1, .buf = ® }, }; if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { @@ -444,8 +444,8 @@ static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) static unsigned char int_addr[2] = { 0, X1205_REG_INT }; struct i2c_client *client = to_i2c_client(dev); struct i2c_msg msgs[] = { - { client->addr, 0, 2, int_addr }, /* setup read ptr */ - { client->addr, I2C_M_RD, 1, &intreg }, /* read INT register */ + { .addr = client->addr, .flags = 0, .len = 2, .buf = int_addr }, /* setup read ptr */ + { .addr = client->addr, .flags = I2C_M_RD, .len = 1, .buf = &intreg }, /* read INT register */ }; /* read interrupt register and status register */