Patchwork rtc: core: Prevent repeated calling of alarm_irq_enable().

login
register
mail settings
Submitter Jonghwa Lee
Date Feb. 6, 2013, 11:22 a.m.
Message ID <1360149765-19565-1-git-send-email-jonghwa3.lee@samsung.com>
Download mbox | patch
Permalink /patch/218557/
State New
Headers show

Comments

Jonghwa Lee - Feb. 6, 2013, 11:22 a.m.
This patch removes repeated execution of disabling alarm in
rtc_alarm_irq_enable() of rtc core interface. It made useless
call even all alarm had been disabled from rtc_timer_remove().
We'd better to skip disabling alarm when timer queue is empty.

Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
---
 drivers/rtc/interface.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Andrew Morton - Feb. 6, 2013, 9:12 p.m.
On Wed, 06 Feb 2013 20:22:45 +0900
Jonghwa Lee <jonghwa3.lee@samsung.com> wrote:

> This patch removes repeated execution of disabling alarm in
> rtc_alarm_irq_enable() of rtc core interface. It made useless
> call even all alarm had been disabled from rtc_timer_remove().
> We'd better to skip disabling alarm when timer queue is empty.
> 

I fear that patch does more than that.

> --- a/drivers/rtc/interface.c
> +++ b/drivers/rtc/interface.c
> @@ -428,7 +428,7 @@ int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled)
>  			rtc_timer_remove(rtc, &rtc->aie_timer);
>  	}
>  
> -	if (err)
> +	if (err || !rtc->timerqueue.next)
>  		/* nothing */;
>  	else if (!rtc->ops)
>  		err = -ENODEV;

This will prevent the irq from being *enabled*, as well as disabled.

To match your description, we'd need to also check that enabled==0?

Patch

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 9592b93..11cfb76 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -428,7 +428,7 @@  int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled)
 			rtc_timer_remove(rtc, &rtc->aie_timer);
 	}
 
-	if (err)
+	if (err || !rtc->timerqueue.next)
 		/* nothing */;
 	else if (!rtc->ops)
 		err = -ENODEV;