From: Stephen Cameron <stephenmcameron@gmail.com>
Date: Fri, 23 Jan 2015 22:43:56 +0000 (-0600)
Subject: hpsa: do not check for msi(x) in interrupt_pending
X-Git-Tag: v4.0-rc1~126^2~23
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c2b0acde0608542add2bfc2a73c23b98f20eeec4;p=karo-tx-linux.git

hpsa: do not check for msi(x) in interrupt_pending

No need to check whether interrupt pending for MSI(X) and
conversely, no need to check whether MSI(X) interrupts are
being used when checking if interrupts are pending.

Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index aa6cb0b0b427..239eceac8b60 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -479,9 +479,6 @@ static bool SA5_performant_intr_pending(struct ctlr_info *h)
 	if (!register_value)
 		return false;
 
-	if (h->msi_vector || h->msix_vector)
-		return true;
-
 	/* Read outbound doorbell to flush */
 	register_value = readl(h->vaddr + SA5_OUTDB_STATUS);
 	return register_value & SA5_OUTDB_STATUS_PERF_BIT;