From: Shubhrajyoti D <shubhrajyoti@ti.com>
To: <rtc-linux@googlegroups.com>
Cc: <linux-kernel@vger.kernel.org>, <julia.lawall@lip6.fr>,
Shubhrajyoti D <shubhrajyoti@ti.com>
Subject: [PATCH 7/7] rtc: Convert struct i2c_msg initialization to C99 format
Date: Mon, 17 Sep 2012 19:28:14 +0530 [thread overview]
Message-ID: <1347890294-28467-8-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1347890294-28467-1-git-send-email-shubhrajyoti@ti.com>
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/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 */
--
1.7.5.4
prev parent reply other threads:[~2012-09-17 13:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 13:58 [PATCH 0/7] rtc: convert to c99 format Shubhrajyoti D
2012-09-17 13:58 ` [PATCH 1/7] rtc: Convert struct i2c_msg initialization to C99 format Shubhrajyoti D
2012-09-18 1:44 ` Ryan Mallon
2012-09-18 6:05 ` Shubhrajyoti
2012-09-18 6:10 ` Ryan Mallon
2012-09-17 13:58 ` [PATCH 2/7] " Shubhrajyoti D
2012-09-17 13:58 ` [PATCH 3/7] " Shubhrajyoti D
2012-09-18 1:45 ` Ryan Mallon
2012-09-18 5:38 ` Shubhrajyoti
2012-09-18 1:51 ` Ryan Mallon
2012-09-18 5:40 ` Shubhrajyoti
2012-09-18 5:47 ` Ryan Mallon
2012-09-18 5:53 ` Julia Lawall
2012-09-17 13:58 ` [PATCH 4/7] " Shubhrajyoti D
2012-09-17 13:58 ` [PATCH 5/7] " Shubhrajyoti D
2012-09-17 13:58 ` [PATCH 6/7] " Shubhrajyoti D
2012-09-17 13:58 ` Shubhrajyoti D [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347890294-28467-8-git-send-email-shubhrajyoti@ti.com \
--to=shubhrajyoti@ti.com \
--cc=julia.lawall@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®