Skip to content

Commit

Permalink
PCI: Remove MSI/MSI-X cap check in pci_msi_check_device()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gavin Shan authored and Bjorn Helgaas committed Apr 23, 2013
1 parent e375b56 commit cdf1fd4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/pci/msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit cdf1fd4

Please sign in to comment.