PCI: altera-msi: Remove IRQ handler and data in one go

Call irq_set_chained_handler_and_data() to clear the chained handler
and the handler's data under irq_desc->lock.

See also 2cf5a03cb29d ("PCI/keystone: Fix race in installing chained
IRQ handler").

Link: https://lore.kernel.org/r/20210115212435.19940-1-martin@kaiser.cx
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c
index e1636f7..42691dd 100644 (file)
--- a/drivers/pci/controller/pcie-altera-msi.c
+++ b/drivers/pci/controller/pcie-altera-msi.c
@@ -204,8 +204,7 @@ static int altera_msi_remove(struct platform_device *pdev)
        struct altera_msi *msi = platform_get_drvdata(pdev);
 
        msi_writel(msi, 0, MSI_INTMASK);
-       irq_set_chained_handler(msi->irq, NULL);
-       irq_set_handler_data(msi->irq, NULL);
+       irq_set_chained_handler_and_data(msi->irq, NULL, NULL);
 
        altera_free_domains(msi);