Merge tag 'module-implicit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 229426dee1eaa0a6f16c2dcee0964482f823c0d5..8bba022be946ebc4380bc692c78637ff487c292a 100644 (file)
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -358,13 +358,13 @@ static int pcf8563_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm)
        struct i2c_client *client = to_i2c_client(dev);
        unsigned char buf[4];
        int err;
-       unsigned long alarm_time;
 
        /* The alarm has no seconds, round up to nearest minute */
        if (tm->time.tm_sec) {
-               rtc_tm_to_time(&tm->time, &alarm_time);
-               alarm_time += 60-tm->time.tm_sec;
-               rtc_time_to_tm(alarm_time, &tm->time);
+               time64_t alarm_time = rtc_tm_to_time64(&tm->time);
+
+               alarm_time += 60 - tm->time.tm_sec;
+               rtc_time64_to_tm(alarm_time, &tm->time);
        }
 
        dev_dbg(dev, "%s, min=%d hour=%d wday=%d mday=%d "
@@ -432,7 +432,7 @@ static int pcf8563_probe(struct i2c_client *client,
        }
 
        err = pcf8563_get_alarm_mode(client, NULL, &alm_pending);
-       if (err < 0) {
+       if (err) {
                dev_err(&client->dev, "%s: read error\n", __func__);
                return err;
        }