]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drivers/rtc/rtc-tps65910.c: remove unnecessary irq stat save and restore
authorLaxman Dewangan <ldewangan@nvidia.com>
Fri, 22 Feb 2013 00:44:36 +0000 (16:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Feb 2013 01:22:28 +0000 (17:22 -0800)
The driver stores the interrupt enable register before going to suspend
and restore in resume.  Also it enables alarm before going to suspend.

The driver only write the Interrupt enable register for enabling ALARM and
does not enable any other bits.  So it is not require to save complete
register and enable ALARM interrupt before suspend and restore in resume.

Also ALARM interrupt already enable if alarm is enabled before going to
suspend and hence it is not require to enable explictly in suspend.

Removing such above code.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-tps65910.c

index 932a655aa41ceb28e250fec873b80d6ae61441bc..7ef42c25358cc2730ef1b4415090d2f11a419438 100644 (file)
@@ -28,8 +28,6 @@
 struct tps65910_rtc {
        struct rtc_device       *rtc;
        int irq;
-       /* To store the list of enabled interrupts */
-       u32 irqstat;
 };
 
 /* Total number of RTC registers needed to set time*/
@@ -309,35 +307,20 @@ static int tps65910_rtc_remove(struct platform_device *pdev)
 
 static int tps65910_rtc_suspend(struct device *dev)
 {
-       struct tps65910 *tps = dev_get_drvdata(dev->parent);
        struct tps65910_rtc *tps_rtc = dev_get_drvdata(dev);
-       u8 alarm = TPS65910_RTC_INTERRUPTS_IT_ALARM;
-       int ret;
 
        if (device_may_wakeup(dev))
                enable_irq_wake(tps_rtc->irq);
-
-       /* Store current list of enabled interrupts*/
-       ret = regmap_read(tps->regmap, TPS65910_RTC_INTERRUPTS,
-               &tps->rtc->irqstat);
-       if (ret < 0)
-               return ret;
-
-       /* Enable RTC ALARM interrupt only */
-       return regmap_write(tps->regmap, TPS65910_RTC_INTERRUPTS, alarm);
+       return 0;
 }
 
 static int tps65910_rtc_resume(struct device *dev)
 {
-       struct tps65910 *tps = dev_get_drvdata(dev->parent);
        struct tps65910_rtc *tps_rtc = dev_get_drvdata(dev);
 
        if (device_may_wakeup(dev))
                disable_irq_wake(tps_rtc->irq);
-
-       /* Restore list of enabled interrupts before suspend */
-       return regmap_write(tps->regmap, TPS65910_RTC_INTERRUPTS,
-               tps->rtc->irqstat);
+       return 0;
 }
 
 static const struct dev_pm_ops tps65910_rtc_pm_ops = {