[PATCH v3 1/3] PCI: altera-msi: remove chained IRQ handler and data in one go

From: Martin Kaiser
Date: Thu Nov 12 2020 - 17:10:39 EST


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").

Signed-off-by: Martin Kaiser <martin@xxxxxxxxx>
---
v3:
- rewrite the commit message again. this is no race condition if we
remove the interrupt handler. sorry for the noise.
v2:
- rewrite the commit message to clarify that this is a bugfix

drivers/pci/controller/pcie-altera-msi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c
index e1636f7714ca..42691dd8ebef 100644
--- 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);

--
2.20.1