Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5815e5d3 authored by Mark Brown's avatar Mark Brown Committed by Linus Torvalds
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6ba8bcd4

drivers/rtc/rtc-wm831x.c

+8 −8
Original line number Diff line number Diff line
@@ -449,16 +449,16 @@ static int wm831x_rtc_probe(struct platform_device *pdev) 
		goto err;

	}



	ret = wm831x_request_irq(wm831x, per_irq, wm831x_per_irq,

				 IRQF_TRIGGER_RISING, "wm831x_rtc_per",

	ret = request_threaded_irq(per_irq, NULL, wm831x_per_irq,

				   IRQF_TRIGGER_RISING, "RTC period",

				   wm831x_rtc);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n",

			per_irq, ret);

	}



	ret = wm831x_request_irq(wm831x, alm_irq, wm831x_alm_irq,

				 IRQF_TRIGGER_RISING, "wm831x_rtc_alm",

	ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq,

				   IRQF_TRIGGER_RISING, "RTC alarm",

				   wm831x_rtc);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n",
@@ -478,8 +478,8 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev) 
	int per_irq = platform_get_irq_byname(pdev, "PER");

	int alm_irq = platform_get_irq_byname(pdev, "ALM");



	wm831x_free_irq(wm831x_rtc->wm831x, alm_irq, wm831x_rtc);

	wm831x_free_irq(wm831x_rtc->wm831x, per_irq, wm831x_rtc);

	free_irq(alm_irq, wm831x_rtc);

	free_irq(per_irq, wm831x_rtc);

	rtc_device_unregister(wm831x_rtc->rtc);

	kfree(wm831x_rtc);