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

Commit fd5231ce authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

rtc: rtc-wm831x: use devm_request_threaded_irq() 



Use devm_request_threaded_irq() to make cleanup paths more simple.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d77bdca

drivers/rtc/rtc-wm831x.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -443,7 +443,8 @@ static int wm831x_rtc_probe(struct platform_device *pdev) 
		goto err;

		goto err;

	}

	}





	ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq,

	ret = devm_request_threaded_irq(&pdev->dev, alm_irq, NULL,

				wm831x_alm_irq,

				IRQF_TRIGGER_RISING, "RTC alarm",

				IRQF_TRIGGER_RISING, "RTC alarm",

				wm831x_rtc);

				wm831x_rtc);

	if (ret != 0) {

	if (ret != 0) {
@@ -462,9 +463,7 @@ err: 
static int wm831x_rtc_remove(struct platform_device *pdev)

static int wm831x_rtc_remove(struct platform_device *pdev)

{

{

	struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);

	struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);

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





	free_irq(alm_irq, wm831x_rtc);

	rtc_device_unregister(wm831x_rtc->rtc);

	rtc_device_unregister(wm831x_rtc->rtc);





	return 0;

	return 0;