lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 293/639] rtc: mt6397: Dont call irq_dispose_mapping.
    Date
    From: Pi-Hsun Shih <pihsun@chromium.org>

    [ 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>
    ---
    drivers/rtc/rtc-mt6397.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
    index f85f1fc29e32e..964ed91416e1b 100644
    --- a/drivers/rtc/rtc-mt6397.c
    +++ b/drivers/rtc/rtc-mt6397.c
    @@ -362,7 +362,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);
    @@ -378,9 +378,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;
    }

    @@ -388,8 +386,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;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:18    [W:3.035 / U:3.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site