Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Lars-Peter Clausen and committed by
Linus Torvalds
3d62b8f5 0942a71e

+3 -20
+3 -20
drivers/rtc/rtc-pcf50633.c
··· 58 58 59 59 struct pcf50633_rtc { 60 60 int alarm_enabled; 61 - int second_enabled; 62 61 int alarm_pending; 63 62 64 63 struct pcf50633 *pcf; ··· 142 143 { 143 144 struct pcf50633_rtc *rtc; 144 145 struct pcf50633_time pcf_tm; 145 - int second_masked, alarm_masked, ret = 0; 146 + int alarm_masked, ret = 0; 146 147 147 148 rtc = dev_get_drvdata(dev); 148 149 ··· 161 162 pcf_tm.time[PCF50633_TI_SEC]); 162 163 163 164 164 - second_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_SECOND); 165 165 alarm_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_ALARM); 166 166 167 - if (!second_masked) 168 - pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND); 169 167 if (!alarm_masked) 170 168 pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM); 171 169 ··· 171 175 PCF50633_TI_EXTENT, 172 176 &pcf_tm.time[0]); 173 177 174 - if (!second_masked) 175 - pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND); 176 178 if (!alarm_masked) 177 179 pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM); 178 180 ··· 244 250 { 245 251 struct pcf50633_rtc *rtc = data; 246 252 247 - switch (irq) { 248 - case PCF50633_IRQ_ALARM: 249 - rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF); 250 - rtc->alarm_pending = 1; 251 - break; 252 - case PCF50633_IRQ_SECOND: 253 - rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF); 254 - break; 255 - } 253 + rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF); 254 + rtc->alarm_pending = 1; 256 255 } 257 256 258 257 static int __devinit pcf50633_rtc_probe(struct platform_device *pdev) ··· 269 282 270 283 pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM, 271 284 pcf50633_rtc_irq, rtc); 272 - pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_SECOND, 273 - pcf50633_rtc_irq, rtc); 274 - 275 285 return 0; 276 286 } 277 287 ··· 279 295 rtc = platform_get_drvdata(pdev); 280 296 281 297 pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM); 282 - pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_SECOND); 283 298 284 299 rtc_device_unregister(rtc->rtc_dev); 285 300 kfree(rtc);