drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq

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

diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index f91be04b90508e3ede7791a5257ae251a120da2a..3b5b4fa9a6e9a2f13fce5f0938c5517f32e3f886 100644 (file)
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -103,7 +103,7 @@ static inline unsigned long read_elapsed_second(void)
                second_mid = rtc1_read(ETIMEMREG);
                second_high = rtc1_read(ETIMEHREG);
        } while (first_low != second_low || first_mid != second_mid ||
-                first_high != second_high);
+                first_high != second_high);
 
        return (first_high << 17) | (first_mid << 1) | (first_low >> 15);
 }
@@ -154,7 +154,7 @@ static int vr41xx_rtc_set_time(struct device *dev, struct rtc_time *time)
 
        epoch_sec = mktime(epoch, 1, 1, 0, 0, 0);
        current_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
-                            time->tm_hour, time->tm_min, time->tm_sec);
+                            time->tm_hour, time->tm_min, time->tm_sec);
 
        write_elapsed_second(current_sec - epoch_sec);
 
@@ -186,7 +186,7 @@ static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
        struct rtc_time *time = &wkalrm->time;
 
        alarm_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
-                          time->tm_hour, time->tm_min, time->tm_sec);
+                          time->tm_hour, time->tm_min, time->tm_sec);
 
        spin_lock_irq(&rtc_lock);
 
@@ -334,7 +334,7 @@ static int rtc_probe(struct platform_device *pdev)
        }
 
        retval = request_irq(aie_irq, elapsedtime_interrupt, 0,
-                            "elapsed_time", pdev);
+                            "elapsed_time", pdev);
        if (retval < 0)
                goto err_device_unregister;
 
@@ -343,7 +343,7 @@ static int rtc_probe(struct platform_device *pdev)
                goto err_free_irq;
 
        retval = request_irq(pie_irq, rtclong1_interrupt, 0,
-                            "rtclong1", pdev);
+                            "rtclong1", pdev);
        if (retval < 0)
                goto err_free_irq;
 
@@ -381,8 +381,6 @@ static int rtc_remove(struct platform_device *pdev)
        if (rtc)
                rtc_device_unregister(rtc);
 
-       platform_set_drvdata(pdev, NULL);
-
        free_irq(aie_irq, pdev);
        free_irq(pie_irq, pdev);
        if (rtc1_base)