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

Commit bffcbc08 authored by Josh Cartwright's avatar Josh Cartwright Committed by Linus Torvalds
Browse files

rtc: pm8xxx: use devm_request_any_context_irq 



Make use of the devm_* variant of request_any_context_irq to allow for
elimination of remove().

Signed-off-by: default avatarJosh Cartwright <joshc@codeaurora.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
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 5d7dc4cf

drivers/rtc/rtc-pm8xxx.c

+4 −14
Original line number Diff line number Diff line
@@ -434,8 +434,9 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev) 
	}



	/* Request the alarm IRQ */

	rc = request_any_context_irq(rtc_dd->rtc_alarm_irq,

				     pm8xxx_alarm_trigger, IRQF_TRIGGER_RISING,

	rc = devm_request_any_context_irq(&pdev->dev, rtc_dd->rtc_alarm_irq,

					  pm8xxx_alarm_trigger,

					  IRQF_TRIGGER_RISING,

					  "pm8xxx_rtc_alarm", rtc_dd);

	if (rc < 0) {

		dev_err(&pdev->dev, "Request IRQ failed (%d)\n", rc);
@@ -449,16 +450,6 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev) 
	return 0;

}



static int pm8xxx_rtc_remove(struct platform_device *pdev)

{

	struct pm8xxx_rtc *rtc_dd = platform_get_drvdata(pdev);



	device_init_wakeup(&pdev->dev, 0);

	free_irq(rtc_dd->rtc_alarm_irq, rtc_dd);



	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int pm8xxx_rtc_resume(struct device *dev)

{
@@ -487,7 +478,6 @@ static SIMPLE_DEV_PM_OPS(pm8xxx_rtc_pm_ops, 


static struct platform_driver pm8xxx_rtc_driver = {

	.probe		= pm8xxx_rtc_probe,

	.remove		= pm8xxx_rtc_remove,

	.driver	= {

		.name	= PM8XXX_RTC_DEV_NAME,

		.owner	= THIS_MODULE,