Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdf1fd4d authored by Gavin Shan's avatar Gavin Shan Committed by Bjorn Helgaas
Browse files

PCI: Remove MSI/MSI-X cap check in pci_msi_check_device() 



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: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e375b561

drivers/pci/msi.c

+1 −4
Original line number Diff line number Diff line
@@ -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);