]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rtc-da9063-rtc-driver-fix
authorAndrew Morton <akpm@linux-foundation.org>
Thu, 22 May 2014 00:43:52 +0000 (10:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 May 2014 00:43:52 +0000 (10:43 +1000)
coding-style tweaks

Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Dajun Chen <david.chen@diasemi.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Mark Brown <broonie@linaro.org>
Cc: Opensource [Steve Twiss] <stwiss.opensource@diasemi.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/rtc/rtc-da9063.c

index d7b15e37a7cf677644b7586ba9fa570b2f76ba54..595393098b09cf7b3924c7a38a5c91c0ec2a9b4e 100644 (file)
@@ -82,6 +82,7 @@ static void da9063_tm_to_data(struct rtc_time *tm, u8 *data)
 static int da9063_rtc_stop_alarm(struct device *dev)
 {
        struct da9063_rtc *rtc = dev_get_drvdata(dev);
+
        return regmap_update_bits(rtc->hw->regmap, DA9063_REG_ALARM_Y,
                                  DA9063_ALARM_ON, 0);
 }
@@ -89,6 +90,7 @@ static int da9063_rtc_stop_alarm(struct device *dev)
 static int da9063_rtc_start_alarm(struct device *dev)
 {
        struct da9063_rtc *rtc = dev_get_drvdata(dev);
+
        return regmap_update_bits(rtc->hw->regmap, DA9063_REG_ALARM_Y,
                                  DA9063_ALARM_ON, DA9063_ALARM_ON);
 }
@@ -115,13 +117,12 @@ static int da9063_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
        da9063_data_to_tm(data, tm);
 
-       (void)rtc_tm_to_time(tm, &tm_secs);
-       (void)rtc_tm_to_time(&rtc->alarm_time, &al_secs);
+       rtc_tm_to_time(tm, &tm_secs);
+       rtc_tm_to_time(&rtc->alarm_time, &al_secs);
 
        /* handle the rtc synchronisation delay */
        if (rtc->rtc_sync == true && al_secs - tm_secs == 1)
-               (void)memcpy((void *)tm, (const void *)&rtc->alarm_time,
-                            sizeof(struct rtc_time));
+               memcpy(tm, &rtc->alarm_time, sizeof(struct rtc_time));
        else
                rtc->rtc_sync = false;