Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 07:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

drivers/rtc/rtc-pcf50633.c: don't request update IRQ

Browse Source 
Commit 51ba60c5 ("RTC: Cleanup rtc_class_ops->update_irq_enable()")
removed the only user of the update IRQ, so there is no need to manage it
any more.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Lars-Peter Clausen 2011-05-26 16:25:10 -07:00 committed by Linus Torvalds
parent 0942a71e43
commit 3d62b8f59b
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/rtc/rtc-pcf50633.c
View File

@ -58,7 +58,6 @@ struct pcf50633_time {
struct pcf50633_rtc { struct pcf50633_rtc {
int alarm_enabled; int alarm_enabled;
int second_enabled;
int alarm_pending; int alarm_pending;
struct pcf50633 *pcf; struct pcf50633 *pcf;
@ -143,7 +142,7 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
{ {
struct pcf50633_rtc *rtc; struct pcf50633_rtc *rtc;
struct pcf50633_time pcf_tm; struct pcf50633_time pcf_tm;
int second_masked, alarm_masked, ret = 0; int alarm_masked, ret = 0;
rtc = dev_get_drvdata(dev); rtc = dev_get_drvdata(dev);
@ -162,11 +161,8 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
pcf_tm.time[PCF50633_TI_SEC]); pcf_tm.time[PCF50633_TI_SEC]);
second_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_SECOND);
alarm_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_ALARM); alarm_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_ALARM);
if (!second_masked)
pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND);
if (!alarm_masked) if (!alarm_masked)
pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM); pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM);
@ -175,8 +171,6 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
PCF50633_TI_EXTENT, PCF50633_TI_EXTENT,
&pcf_tm.time[0]); &pcf_tm.time[0]);
if (!second_masked)
pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND);
if (!alarm_masked) if (!alarm_masked)
pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM); pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
@ -250,15 +244,8 @@ static void pcf50633_rtc_irq(int irq, void *data)
{ {
struct pcf50633_rtc *rtc = data; struct pcf50633_rtc *rtc = data;
switch (irq) { rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
case PCF50633_IRQ_ALARM: rtc->alarm_pending = 1;
rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
rtc->alarm_pending = 1;
break;
case PCF50633_IRQ_SECOND:
rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF);
break;
}
} }
static int __devinit pcf50633_rtc_probe(struct platform_device *pdev) static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
@ -282,9 +269,6 @@ static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM, pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,
pcf50633_rtc_irq, rtc); pcf50633_rtc_irq, rtc);
pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_SECOND,
pcf50633_rtc_irq, rtc);
return 0; return 0;
} }
@ -295,7 +279,6 @@ static int __devexit pcf50633_rtc_remove(struct platform_device *pdev)
rtc = platform_get_drvdata(pdev); rtc = platform_get_drvdata(pdev);
pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM); pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM);
pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_SECOND);
rtc_device_unregister(rtc->rtc_dev); rtc_device_unregister(rtc->rtc_dev);
kfree(rtc); kfree(rtc);