hwmon: (nct6775) Swap STEP_UP_TIME and STEP_DOWN_TIME registers for most chips

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-as3722.c

diff --git a/drivers/rtc/rtc-as3722.c b/drivers/rtc/rtc-as3722.c
index 4af016985890e6d70a7f57a9b7c605cde1d9723d..56cc5821118bfbcaf1c71eb5a334595d93fbc18e 100644 (file)
--- a/drivers/rtc/rtc-as3722.c
+++ b/drivers/rtc/rtc-as3722.c
@@ -45,7 +45,7 @@ static void as3722_time_to_reg(u8 *rbuff, struct rtc_time *tm)
        rbuff[1] = bin2bcd(tm->tm_min);
        rbuff[2] = bin2bcd(tm->tm_hour);
        rbuff[3] = bin2bcd(tm->tm_mday);
-       rbuff[4] = bin2bcd(tm->tm_mon);
+       rbuff[4] = bin2bcd(tm->tm_mon + 1);
        rbuff[5] = bin2bcd(tm->tm_year - (AS3722_RTC_START_YEAR - 1900));
 }
 
@@ -55,7 +55,7 @@ static void as3722_reg_to_time(u8 *rbuff, struct rtc_time *tm)
        tm->tm_min = bcd2bin(rbuff[1] & 0x7F);
        tm->tm_hour = bcd2bin(rbuff[2] & 0x3F);
        tm->tm_mday = bcd2bin(rbuff[3] & 0x3F);
-       tm->tm_mon = bcd2bin(rbuff[4] & 0x1F);
+       tm->tm_mon = bcd2bin(rbuff[4] & 0x1F) - 1;
        tm->tm_year = (AS3722_RTC_START_YEAR - 1900) + bcd2bin(rbuff[5] & 0x7F);
        return;
 }
@@ -242,9 +242,8 @@ static int as3722_rtc_resume(struct device *dev)
 }
 #endif
 
-static const struct dev_pm_ops as3722_rtc_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(as3722_rtc_suspend, as3722_rtc_resume)
-};
+static SIMPLE_DEV_PM_OPS(as3722_rtc_pm_ops, as3722_rtc_suspend,
+                        as3722_rtc_resume);
 
 static struct platform_driver as3722_rtc_driver = {
        .probe = as3722_rtc_probe,