[2/4] PCI: Remove MSI/MSI-X cap check in pci_msi_check_device()

Message ID 1365130473-7413-3-git-send-email-shangw@linux.vnet.ibm.com
State Superseded
Headers show

Commit Message

Gavin Shan April 5, 2013, 2:54 a.m.
The function pci_msi_check_device() is called while enabling MSI
or MSI-X interrupts to make sure the PCI device can support MSI
or MSI-X capability. The patch removes the check on MSI or MSI-X
capability in the function and lets the caller does the check.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
 drivers/pci/msi.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 5fdc5d9..1ec1ba9 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -789,9 +789,6 @@  static int pci_msi_check_device(struct pci_dev *dev, int nvec, int type)
 	if (ret)
 		return ret;
-	if (!pci_find_capability(dev, type))
-		return -EINVAL;
 	return 0;
@@ -942,7 +939,7 @@  int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
 	int status, nr_entries;
 	int i, j;
-	if (!entries)
+	if (!entries || !dev->msix_cap)
 		return -EINVAL;
 	status = pci_msi_check_device(dev, nvec, PCI_CAP_ID_MSIX);