Merge tag 'xtensa-for-next-20141021-2' of git://github.com/jcmvbkbc/linux-xtensa...

[linux-2.6-block.git] / drivers / rtc / rtc-pcf8583.c

diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index c2639845186b3f8433551116074ae19197ee1866..5911a6dca29199d976fd71b72e818eda1480431c 100644 (file)
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -176,7 +176,11 @@ static int pcf8583_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
        struct i2c_client *client = to_i2c_client(dev);
        unsigned char ctrl, year[2];
-       struct rtc_mem mem = { CMOS_YEAR, sizeof(year), year };
+       struct rtc_mem mem = {
+               .loc = CMOS_YEAR,
+               .nr = sizeof(year),
+               .data = year
+       };
        int real_year, year_offset, err;
 
        /*
@@ -222,8 +226,16 @@ static int pcf8583_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct i2c_client *client = to_i2c_client(dev);
        unsigned char year[2], chk;
-       struct rtc_mem cmos_year  = { CMOS_YEAR, sizeof(year), year };
-       struct rtc_mem cmos_check = { CMOS_CHECKSUM, 1, &chk };
+       struct rtc_mem cmos_year  = {
+               .loc = CMOS_YEAR,
+               .nr = sizeof(year),
+               .data = year
+       };
+       struct rtc_mem cmos_check = {
+               .loc = CMOS_CHECKSUM,
+               .nr = 1,
+               .data = &chk
+       };
        unsigned int proper_year = tm->tm_year + 1900;
        int ret;