Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5815e5d36eff44b3dd38943f3a98a4d9ce985118

Authored by Mark Brown
Committed by Linus Torvalds
1 parent 6ba8bcd457

rtc: use genirq directly in rtc-wm831x 

Now that the WM831x core uses genirq for the IRQ controller there is no
need to use the WM831x-specific wrappers to request interrupts so convert
to use genirq directly.

Also use more meaningful strings to make /proc/interrupts more readily
legible.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

drivers/rtc/rtc-wm831x.c
Diff comments   View file @ 5815e5d
... ... @@ -449,17 +449,17 @@
449 449 goto err;
450 450 }
451 451  
452   - ret = wm831x_request_irq(wm831x, per_irq, wm831x_per_irq,
453   - IRQF_TRIGGER_RISING, "wm831x_rtc_per",
454   - wm831x_rtc);
  452 + ret = request_threaded_irq(per_irq, NULL, wm831x_per_irq,
  453 + IRQF_TRIGGER_RISING, "RTC period",
  454 + wm831x_rtc);
455 455 if (ret != 0) {
456 456 dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n",
457 457 per_irq, ret);
458 458 }
459 459  
460   - ret = wm831x_request_irq(wm831x, alm_irq, wm831x_alm_irq,
461   - IRQF_TRIGGER_RISING, "wm831x_rtc_alm",
462   - wm831x_rtc);
  460 + ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq,
  461 + IRQF_TRIGGER_RISING, "RTC alarm",
  462 + wm831x_rtc);
463 463 if (ret != 0) {
464 464 dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n",
465 465 alm_irq, ret);
... ... @@ -478,8 +478,8 @@
478 478 int per_irq = platform_get_irq_byname(pdev, "PER");
479 479 int alm_irq = platform_get_irq_byname(pdev, "ALM");
480 480  
481   - wm831x_free_irq(wm831x_rtc->wm831x, alm_irq, wm831x_rtc);
482   - wm831x_free_irq(wm831x_rtc->wm831x, per_irq, wm831x_rtc);
  481 + free_irq(alm_irq, wm831x_rtc);
  482 + free_irq(per_irq, wm831x_rtc);
483 483 rtc_device_unregister(wm831x_rtc->rtc);
484 484 kfree(wm831x_rtc);
485 485