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

rtc: rtc-da9052: use devm_request_threaded_irq()

Use devm_request_threaded_irq() to make cleanup paths more simple.
Signed-off-by: default avatarJingoo Han <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent fd5231ce
......@@ -240,7 +240,8 @@ static int da9052_rtc_probe(struct platform_device *pdev)
rtc->da9052 = dev_get_drvdata(pdev->dev.parent);
platform_set_drvdata(pdev, rtc);
rtc->irq = platform_get_irq_byname(pdev, "ALM");
ret = request_threaded_irq(rtc->irq, NULL, da9052_rtc_irq,
ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
"ALM", rtc);
if (ret != 0) {
......@@ -250,16 +251,10 @@ static int da9052_rtc_probe(struct platform_device *pdev)
rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
&da9052_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc)) {
ret = PTR_ERR(rtc->rtc);
goto err_free_irq;
if (IS_ERR(rtc->rtc))
return PTR_ERR(rtc->rtc);
return 0;
free_irq(rtc->irq, rtc);
return ret;
static int da9052_rtc_remove(struct platform_device *pdev)
......@@ -267,7 +262,6 @@ static int da9052_rtc_remove(struct platform_device *pdev)
struct da9052_rtc *rtc = pdev->dev.platform_data;
free_irq(rtc->irq, rtc);
platform_set_drvdata(pdev, NULL);
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment