Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 3d62b8f59bb8bd08d8e3df3ab3174aab2971d6e6

Authored by Lars-Peter Clausen
Committed by Linus Torvalds
1 parent 0942a71e43
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 3 additions and 20 deletions Side-by-side Diff

drivers/rtc/rtc-pcf50633.c
Diff comments   View file @ 3d62b8f
... ... @@ -58,7 +58,6 @@
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;
... ... @@ -143,7 +142,7 @@
143 142 {
144 143 struct pcf50633_rtc *rtc;
145 144 struct pcf50633_time pcf_tm;
146   - int second_masked, alarm_masked, ret = 0;
  145 + int alarm_masked, ret = 0;
147 146  
148 147 rtc = dev_get_drvdata(dev);
149 148  
150 149  
... ... @@ -162,11 +161,8 @@
162 161 pcf_tm.time[PCF50633_TI_SEC]);
163 162  
164 163  
165   - second_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_SECOND);
166 164 alarm_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_ALARM);
167 165  
168   - if (!second_masked)
169   - pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND);
170 166 if (!alarm_masked)
171 167 pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM);
172 168  
... ... @@ -175,8 +171,6 @@
175 171 PCF50633_TI_EXTENT,
176 172 &pcf_tm.time[0]);
177 173  
178   - if (!second_masked)
179   - pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND);
180 174 if (!alarm_masked)
181 175 pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
182 176  
... ... @@ -250,15 +244,8 @@
250 244 {
251 245 struct pcf50633_rtc *rtc = data;
252 246  
253   - switch (irq) {
254   - case PCF50633_IRQ_ALARM:
255   - rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
256   - rtc->alarm_pending = 1;
257   - break;
258   - case PCF50633_IRQ_SECOND:
259   - rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF);
260   - break;
261   - }
  247 + rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
  248 + rtc->alarm_pending = 1;
262 249 }
263 250  
264 251 static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
... ... @@ -282,9 +269,6 @@
282 269  
283 270 pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,
284 271 pcf50633_rtc_irq, rtc);
285   - pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_SECOND,
286   - pcf50633_rtc_irq, rtc);
287   -
288 272 return 0;
289 273 }
290 274  
... ... @@ -295,7 +279,6 @@
295 279 rtc = platform_get_drvdata(pdev);
296 280  
297 281 pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM);
298   - pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_SECOND);
299 282  
300 283 rtc_device_unregister(rtc->rtc_dev);
301 284 kfree(rtc);