[v4,04/22] PCI: Remove MSI/MSI-X cap check in pci_msi_check_device()

Message ID 20130422231039.32621.1576.stgit@bhelgaas-glaptop
State Accepted
Headers show

Commit Message

Bjorn Helgaas April 22, 2013, 11:10 p.m.
From: Gavin Shan <shangw@linux.vnet.ibm.com>

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.  This patch removes the check on MSI or MSI-X
capability in the function and lets the caller do the check.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
 drivers/pci/msi.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 99befbd..60a4b10 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);