| Message ID | 1372841225-18813-3-git-send-email-gururaja.hebbar@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 03 July 2013 02:17 PM, Hebbar Gururaja wrote: > Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), > duplicate call from the rtc device registration can be removed. > > This is basically a partial revert of the prev commit > > commit 75c99bb0006ee065b4e2995078d779418b0fab54 > Author: Sekhar Nori <nsekhar@ti.com> > > davinci: da8xx/omap-l1: mark RTC as a wakeup source > > Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> > Acked-by: Kevin Hilman <khilman@linaro.org> > Acked-by: Sekhar Nori <nsekhar@ti.com> > Cc: Russell King <linux@arm.linux.org.uk> Queuing for v3.12. In subject line, please use lower case except for acronyms and for "ARM". Also, we dont use omap-l1 to avoid confusion with the real omaps. Just da8xx is enough. I have fixed these locally this time. Thanks, Sekhar
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index bf57252..9140b1c 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -827,14 +827,7 @@ static struct platform_device da8xx_rtc_device = { int da8xx_register_rtc(void) { - int ret; - - ret = platform_device_register(&da8xx_rtc_device); - if (!ret) - /* Atleast on DA850, RTC is a wakeup source */ - device_init_wakeup(&da8xx_rtc_device.dev, true); - - return ret; + return platform_device_register(&da8xx_rtc_device); } static void __iomem *da8xx_ddr2_ctlr_base;
Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), duplicate call from the rtc device registration can be removed. This is basically a partial revert of the prev commit commit 75c99bb0006ee065b4e2995078d779418b0fab54 Author: Sekhar Nori <nsekhar@ti.com> davinci: da8xx/omap-l1: mark RTC as a wakeup source Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> Acked-by: Kevin Hilman <khilman@linaro.org> Acked-by: Sekhar Nori <nsekhar@ti.com> Cc: Russell King <linux@arm.linux.org.uk> --- Changes in V2: - Coding style corrections (remove extra space) - use prefix ARM: for commit subject keeping with arch/arm convention :100644 100644 bf57252... 9140b1c... M arch/arm/mach-davinci/devices-da8xx.c arch/arm/mach-davinci/devices-da8xx.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)