From 9ac4cdc4f55b566c6b63c6943c6f9c7f2c0623e8 Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Thu, 4 Oct 2012 17:14:17 -0700 Subject: [PATCH] --- yaml --- r: 330119 b: refs/heads/master c: 2bfc37dffa844e5b28a240feec5e2fa8ec2ea8ba h: refs/heads/master i: 330117: 91010db0ab3add6eb5da881a20d5e9b087f8c485 330115: 7ebcad682ca2cc6e203236efc01cc95559ee9cd7 330111: 9f7a0a2b604235cd3d911a9024abd8fc9b85dce7 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-ds1672.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0cb6ba721338..5f6895dca032 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ee8c0ca2a6aef9af4b78f860cc690f33fc8f287 +refs/heads/master: 2bfc37dffa844e5b28a240feec5e2fa8ec2ea8ba diff --git a/trunk/drivers/rtc/rtc-ds1672.c b/trunk/drivers/rtc/rtc-ds1672.c index 7fa67d0df172..45d65c0b3a85 100644 --- a/trunk/drivers/rtc/rtc-ds1672.c +++ b/trunk/drivers/rtc/rtc-ds1672.c @@ -37,8 +37,17 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) unsigned char buf[4]; struct i2c_msg msgs[] = { - {client->addr, 0, 1, &addr}, /* setup read ptr */ - {client->addr, I2C_M_RD, 4, buf}, /* read date */ + {/* setup read ptr */ + .addr = client->addr, + .len = 1, + .buf = &addr + }, + {/* read date */ + .addr = client->addr, + .flags = I2C_M_RD, + .len = 4, + .buf = buf + }, }; /* read date registers */ @@ -99,8 +108,17 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status) unsigned char addr = DS1672_REG_CONTROL; struct i2c_msg msgs[] = { - {client->addr, 0, 1, &addr}, /* setup read ptr */ - {client->addr, I2C_M_RD, 1, status}, /* read control */ + {/* setup read ptr */ + .addr = client->addr, + .len = 1, + .buf = &addr + }, + {/* read control */ + .addr = client->addr, + .flags = I2C_M_RD, + .len = 1, + .buf = status + }, }; /* read control register */