From c70de8c44859dac26ee9e0346de3e02be6064c53 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 5 Apr 2007 17:19:07 +1000 Subject: [PATCH] --- yaml --- r: 53347 b: refs/heads/master c: 17bbc12acdb23ffb9613e12ca974fafd31bfcb56 h: refs/heads/master i: 53345: 9fe4910415a297c60956e7052412eebe15d15ed6 53343: c004f0b6a06feab3abac516f70b06483db52509d v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6fc6081ed06e..daa85ec794b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 128bc5fced238752d01b5169077f2ec624b3d59b +refs/heads/master: 17bbc12acdb23ffb9613e12ca974fafd31bfcb56 diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c index b6dc69ef80a7..34087af68833 100644 --- a/trunk/drivers/pci/msi.c +++ b/trunk/drivers/pci/msi.c @@ -457,15 +457,15 @@ static int msix_capability_init(struct pci_dev *dev, } /** - * pci_msi_supported - check whether MSI may be enabled on device + * pci_msi_check_device - check whether MSI may be enabled on a device * @dev: pointer to the pci_dev data structure of MSI device function * @type: are we checking for MSI or MSI-X ? * * Look at global flags, the device itself, and its parent busses - * to return 0 if MSI are supported for the device. + * to determine if MSI/-X are supported for the device. If MSI/-X is + * supported return 0, else return an error code. **/ -static -int pci_msi_supported(struct pci_dev * dev, int type) +static int pci_msi_check_device(struct pci_dev * dev, int type) { struct pci_bus *bus; @@ -503,7 +503,7 @@ int pci_enable_msi(struct pci_dev* dev) { int status; - if (pci_msi_supported(dev, PCI_CAP_ID_MSI)) + if (pci_msi_check_device(dev, PCI_CAP_ID_MSI)) return -EINVAL; WARN_ON(!!dev->msi_enabled); @@ -601,7 +601,7 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec) int i, j; u16 control; - if (!entries || pci_msi_supported(dev, PCI_CAP_ID_MSIX)) + if (!entries || pci_msi_check_device(dev, PCI_CAP_ID_MSIX)) return -EINVAL; pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);