From: Alexander Gordeev <agordeev@redhat.com>
Date: Mon, 16 Dec 2013 08:34:55 +0000 (+0100)
Subject: s390/PCI: Remove superfluous check of MSI type
X-Git-Tag: v3.14-rc1~132^2~13^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=57b7cb024422bbe85366ef28f5e192997bd16943;p=~emulex%2Finfiniband.git

s390/PCI: Remove superfluous check of MSI type

arch_setup_msi_irqs() hook can only be called from the generic MSI code
which ensures correct MSI type parameter.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 6f3788e3363..4859c401b75 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -407,8 +407,6 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 	struct msi_msg msg;
 	int rc;
 
-	if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI)
-		return -EINVAL;
 	if (type == PCI_CAP_ID_MSI && nvec > 1)
 		return 1;
 	msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX);