rtc: mt6397: Don't call irq_dispose_mapping.

BugLink: https://bugs.launchpad.net/bugs/1863019
[ Upstream commit 24db953e942bd7a983e97892bdaddf69d00b1199 ]

The IRQ mapping was changed to not being created in the rtc-mt6397
driver, so the irq_dispose_mapping is no longer needed.
Also the dev_id passed to free_irq should be the same as the last
argument passed to request_threaded_irq.
This prevents a "Trying to free already-free IRQ 274" warning when
unbinding the driver.

Fixes: e695d3a0b3b3 ("mfd: mt6397: Create irq mappings in mfd core driver")
Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
index c696d918645181d96e69b342911b5bc2deed5c70..05b658f679aab6cf3d52a5c066e501ca912de9b0 100644 (file)
--- a/drivers/rtc/rtc-mt6397.c
+++ b/drivers/rtc/rtc-mt6397.c
@@ -363,7 +363,7 @@ static int mtk_rtc_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
                        rtc->irq, ret);
-               goto out_dispose_irq;
+               return ret;
        }
 
        device_init_wakeup(&pdev->dev, 1);
@@ -379,9 +379,7 @@ static int mtk_rtc_probe(struct platform_device *pdev)
        return 0;
 
 out_free_irq:
-       free_irq(rtc->irq, rtc->rtc_dev);
-out_dispose_irq:
-       irq_dispose_mapping(rtc->irq);
+       free_irq(rtc->irq, rtc);
        return ret;
 }
 
@@ -389,8 +387,7 @@ static int mtk_rtc_remove(struct platform_device *pdev)
 {
        struct mt6397_rtc *rtc = platform_get_drvdata(pdev);
 
-       free_irq(rtc->irq, rtc->rtc_dev);
-       irq_dispose_mapping(rtc->irq);
+       free_irq(rtc->irq, rtc);
 
        return 0;
 }