summaryrefslogtreecommitdiffstats
path: root/drivers/pci/msi.c
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2007-04-05 09:19:07 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2007-05-03 04:02:36 +0200
commit17bbc12acdb23ffb9613e12ca974fafd31bfcb56 (patch)
treebbeb34a927703ba140ca7c7a10c8fc4e85f243bd /drivers/pci/msi.c
parentMSI: Consolidate precondition checks (diff)
downloadlinux-17bbc12acdb23ffb9613e12ca974fafd31bfcb56.tar.xz
linux-17bbc12acdb23ffb9613e12ca974fafd31bfcb56.zip
MSI: Rename pci_msi_supported() to pci_msi_check_device()
As pointed out by Eric, the name pci_msi_supported() suggests it should return a boolean value, however it doesn't. So update the name to be a bit less confusing and update the doco too. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/msi.c')
-rw-r--r--drivers/pci/msi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index b6dc69ef80a7..34087af68833 100644
--- a/drivers/pci/msi.c
+++ b/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);