Re: [PATCH 2/6] powerpc/pseries: Use irq_has_action() in eeh_disable_irq()
From: Grant Likely <hidden>
Date: 2009-10-14 18:33:44
On Tue, Oct 13, 2009 at 11:44 PM, Michael Ellerman [off-list ref] wrote:
Rather than open-coding our own check, use irq_has_action() to check if an irq has an action - ie. is "in use". irq_has_action() doesn't take the descriptor lock, but it shouldn't matter - we're just using it as an indicator that the irq is in use. disable_irq_nosync() will take the descriptor lock before doing anything also. Signed-off-by: Michael Ellerman <redacted>
Looks good to me Acked-by: Grant Likely <redacted>
--- =A0arch/powerpc/platforms/pseries/eeh_driver.c | =A0 18 +----------------=
-
quoted hunk ↗ jump to hunk
=A01 files changed, 1 insertions(+), 17 deletions(-)diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/p=
latforms/pseries/eeh_driver.c
quoted hunk ↗ jump to hunk
index 0e8db67..ef8e454 100644--- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c@@ -63,22 +63,6 @@ static void print_device_node_tree(struct pci_dn *pdn,=
int dent)
quoted hunk ↗ jump to hunk
=A0} =A0#endif -/** - * irq_in_use - return true if this irq is being used - */ -static int irq_in_use(unsigned int irq) -{ - =A0 =A0 =A0 int rc =3D 0; - =A0 =A0 =A0 unsigned long flags; - =A0 struct irq_desc *desc =3D irq_desc + irq; - - =A0 =A0 =A0 spin_lock_irqsave(&desc->lock, flags); - =A0 =A0 =A0 if (desc->action) - =A0 =A0 =A0 =A0 =A0 =A0 =A0 rc =3D 1; - =A0 =A0 =A0 spin_unlock_irqrestore(&desc->lock, flags); - =A0 =A0 =A0 return rc; -} - =A0/** =A0* eeh_disable_irq - disable interrupt for the recovering device =A0*/@@ -93,7 +77,7 @@ static void eeh_disable_irq(struct pci_dev *dev)=A0 =A0 =A0 =A0if (dev->msi_enabled || dev->msix_enabled) =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return; - =A0 =A0 =A0 if (!irq_in_use(dev->irq)) + =A0 =A0 =A0 if (!irq_has_action(dev->irq)) =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return; =A0 =A0 =A0 =A0PCI_DN(dn)->eeh_mode |=3D EEH_MODE_IRQ_DISABLED; -- 1.6.2.1 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
--=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.