Commit 45bcf018 authored Nov 28, 2011 by Stephen M. Cameron Committed by James Bottomley Dec 15, 2011

[SCSI] hpsa: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler



IRQF_SHARED is required for older controllers that don't support MSI(X)
and which may end up sharing an interrupt.  All the controllers hpsa
normally supports have MSI(X) capability, but older controllers may be
encountered via the hpsa_allow_any=1 module parameter.

Also remove deprecated IRQF_DISABLED.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 85d37226

drivers/scsi/hpsa.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4072,10 +4072,10 @@ static int hpsa_request_irq(struct ctlr_info *h,

		if (h->msix_vector \|\| h->msi_vector)
		rc = request_irq(h->intr[h->intr_mode], msixhandler,
		IRQF_DISABLED, h->devname, h);
		0, h->devname, h);
		else
		rc = request_irq(h->intr[h->intr_mode], intxhandler,
		IRQF_DISABLED, h->devname, h);
		IRQF_SHARED, h->devname, h);
		if (rc) {
		dev_err(&h->pdev->dev, "unable to get irq %d for %s\n",
		h->intr[h->intr_mode], h->devname);

Admin message