diff mbox series

[v4,2/3] PCI: dwc: Remove IRQ handler and data in one go

Message ID 20210115212435.19940-2-martin@kaiser.cx
State New
Headers show
Series [v4,1/3] PCI: altera-msi: Remove IRQ handler and data in one go | expand

Commit Message

Martin Kaiser Jan. 15, 2021, 9:24 p.m. UTC
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@kaiser.cx>
 - resend after two months
 - capitalize the commit message properly
 - rewrite the commit message again. this is no race condition if we
   remove the interrupt handler. sorry for the noise.
 - rewrite the commit message to clarify that this is a bugfix

 drivers/pci/controller/dwc/pcie-designware-host.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 8a84c005f32b..3837fff48944 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -258,10 +258,8 @@  int dw_pcie_allocate_domains(struct pcie_port *pp)
 static void dw_pcie_free_msi(struct pcie_port *pp)
-	if (pp->msi_irq) {
-		irq_set_chained_handler(pp->msi_irq, NULL);
-		irq_set_handler_data(pp->msi_irq, NULL);
-	}
+	if (pp->msi_irq)
+		irq_set_chained_handler_and_data(pp->msi_irq, NULL, NULL);