From c1879fe80c61f3be6f2ddb82509c2e7f92a484fe Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Thu, 21 Feb 2013 16:45:44 -0800 Subject: [PATCH] rtc: rtc-max8997: use devm_request_threaded_irq() Use devm_request_threaded_irq() to make cleanup paths more simple. Signed-off-by: Jingoo Han Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/rtc/rtc-max8997.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c index a4e7079fb863..00e505b6bee3 100644 --- a/drivers/rtc/rtc-max8997.c +++ b/drivers/rtc/rtc-max8997.c @@ -495,7 +495,8 @@ static int max8997_rtc_probe(struct platform_device *pdev) } info->virq = virq; - ret = request_threaded_irq(virq, NULL, max8997_rtc_alarm_irq, 0, + ret = devm_request_threaded_irq(&pdev->dev, virq, NULL, + max8997_rtc_alarm_irq, 0, "rtc-alarm0", info); if (ret < 0) { dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n", @@ -514,10 +515,8 @@ static int max8997_rtc_remove(struct platform_device *pdev) { struct max8997_rtc_info *info = platform_get_drvdata(pdev); - if (info) { - free_irq(info->virq, info); + if (info) rtc_device_unregister(info->rtc_dev); - } return 0; }