OSDN Git Service

dmaengine: mv_xor_v2: explicitly freeup irq
authorHanna Hawa <hannah@marvell.com>
Tue, 17 Jul 2018 10:29:59 +0000 (13:29 +0300)
committerVinod Koul <vkoul@kernel.org>
Fri, 20 Jul 2018 09:31:58 +0000 (15:01 +0530)
dmaengine device should explicitly call devm_free_irq() when using
devm_request_irq().

The irq is still ON when devices remove is executed and irq should be
quiesced before remove is completed.

Signed-off-by: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/mv_xor_v2.c

index c6589cc..e16083a 100644 (file)
@@ -174,6 +174,7 @@ struct mv_xor_v2_device {
        int desc_size;
        unsigned int npendings;
        unsigned int hw_queue_idx;
+       struct msi_desc *msi_desc;
 };
 
 /**
@@ -780,6 +781,7 @@ static int mv_xor_v2_probe(struct platform_device *pdev)
        msi_desc = first_msi_entry(&pdev->dev);
        if (!msi_desc)
                goto free_msi_irqs;
+       xor_dev->msi_desc = msi_desc;
 
        ret = devm_request_irq(&pdev->dev, msi_desc->irq,
                               mv_xor_v2_interrupt_handler, 0,
@@ -897,6 +899,8 @@ static int mv_xor_v2_remove(struct platform_device *pdev)
                          xor_dev->desc_size * MV_XOR_V2_DESC_NUM,
                          xor_dev->hw_desq_virt, xor_dev->hw_desq);
 
+       devm_free_irq(&pdev->dev, xor_dev->msi_desc->irq, xor_dev);
+
        platform_msi_domain_free_irqs(&pdev->dev);
 
        clk_disable_unprepare(xor_dev->clk);