diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci/msi.c | 2 | ||||
-rw-r--r-- | drivers/pci/pci-driver.c | 13 | ||||
-rw-r--r-- | drivers/pci/pci.c | 7 | ||||
-rw-r--r-- | drivers/pci/probe.c | 1 |
4 files changed, 16 insertions, 7 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index ee8677bda950..a2033552423c 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
@@ -575,6 +575,8 @@ static int msi_capability_init(struct pci_dev *dev) | |||
575 | /** | 575 | /** |
576 | * msix_capability_init - configure device's MSI-X capability | 576 | * msix_capability_init - configure device's MSI-X capability |
577 | * @dev: pointer to the pci_dev data structure of MSI-X device function | 577 | * @dev: pointer to the pci_dev data structure of MSI-X device function |
578 | * @entries: pointer to an array of struct msix_entry entries | ||
579 | * @nvec: number of @entries | ||
578 | * | 580 | * |
579 | * Setup the MSI-X capability structure of device function with a | 581 | * Setup the MSI-X capability structure of device function with a |
580 | * single MSI-X vector. A return of zero indicates the successful setup of | 582 | * single MSI-X vector. A return of zero indicates the successful setup of |
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index f906f1a8fe6a..8972e6a3aac0 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -26,7 +26,10 @@ struct pci_dynid { | |||
26 | #ifdef CONFIG_HOTPLUG | 26 | #ifdef CONFIG_HOTPLUG |
27 | 27 | ||
28 | /** | 28 | /** |
29 | * store_new_id | 29 | * store_new_id - add a new PCI device ID to this driver and re-probe devices |
30 | * @driver: target device driver | ||
31 | * @buf: buffer for scanning device ID data | ||
32 | * @count: input size | ||
30 | * | 33 | * |
31 | * Adds a new dynamic pci device ID to this driver, | 34 | * Adds a new dynamic pci device ID to this driver, |
32 | * and causes the driver to probe for all devices again. | 35 | * and causes the driver to probe for all devices again. |
@@ -194,8 +197,10 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, | |||
194 | 197 | ||
195 | /** | 198 | /** |
196 | * __pci_device_probe() | 199 | * __pci_device_probe() |
200 | * @drv: driver to call to check if it wants the PCI device | ||
201 | * @pci_dev: PCI device being probed | ||
197 | * | 202 | * |
198 | * returns 0 on success, else error. | 203 | * returns 0 on success, else error. |
199 | * side-effect: pci_dev->driver is set to drv when drv claims pci_dev. | 204 | * side-effect: pci_dev->driver is set to drv when drv claims pci_dev. |
200 | */ | 205 | */ |
201 | static int | 206 | static int |
@@ -440,11 +445,11 @@ pci_dev_driver(const struct pci_dev *dev) | |||
440 | 445 | ||
441 | /** | 446 | /** |
442 | * pci_bus_match - Tell if a PCI device structure has a matching PCI device id structure | 447 | * pci_bus_match - Tell if a PCI device structure has a matching PCI device id structure |
443 | * @ids: array of PCI device id structures to search in | ||
444 | * @dev: the PCI device structure to match against | 448 | * @dev: the PCI device structure to match against |
449 | * @drv: the device driver to search for matching PCI device id structures | ||
445 | * | 450 | * |
446 | * Used by a driver to check whether a PCI device present in the | 451 | * Used by a driver to check whether a PCI device present in the |
447 | * system is in its list of supported devices.Returns the matching | 452 | * system is in its list of supported devices. Returns the matching |
448 | * pci_device_id structure or %NULL if there is no match. | 453 | * pci_device_id structure or %NULL if there is no match. |
449 | */ | 454 | */ |
450 | static int pci_bus_match(struct device *dev, struct device_driver *drv) | 455 | static int pci_bus_match(struct device *dev, struct device_driver *drv) |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 39bdb938521d..61b855c99e39 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -252,6 +252,8 @@ pci_restore_bars(struct pci_dev *dev) | |||
252 | pci_update_resource(dev, &dev->resource[i], i); | 252 | pci_update_resource(dev, &dev->resource[i], i); |
253 | } | 253 | } |
254 | 254 | ||
255 | int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t t); | ||
256 | |||
255 | /** | 257 | /** |
256 | * pci_set_power_state - Set the power state of a PCI device | 258 | * pci_set_power_state - Set the power state of a PCI device |
257 | * @dev: PCI device to be suspended | 259 | * @dev: PCI device to be suspended |
@@ -266,7 +268,6 @@ pci_restore_bars(struct pci_dev *dev) | |||
266 | * -EIO if device does not support PCI PM. | 268 | * -EIO if device does not support PCI PM. |
267 | * 0 if we can successfully change the power state. | 269 | * 0 if we can successfully change the power state. |
268 | */ | 270 | */ |
269 | int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t t); | ||
270 | int | 271 | int |
271 | pci_set_power_state(struct pci_dev *dev, pci_power_t state) | 272 | pci_set_power_state(struct pci_dev *dev, pci_power_t state) |
272 | { | 273 | { |
@@ -808,8 +809,8 @@ pci_clear_mwi(struct pci_dev *dev) | |||
808 | 809 | ||
809 | /** | 810 | /** |
810 | * pci_intx - enables/disables PCI INTx for device dev | 811 | * pci_intx - enables/disables PCI INTx for device dev |
811 | * @dev: the PCI device to operate on | 812 | * @pdev: the PCI device to operate on |
812 | * @enable: boolean | 813 | * @enable: boolean: whether to enable or disable PCI INTx |
813 | * | 814 | * |
814 | * Enables/disables PCI INTx for device dev | 815 | * Enables/disables PCI INTx for device dev |
815 | */ | 816 | */ |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 005786416bb5..fce2cb2112d8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -669,6 +669,7 @@ static void pci_release_dev(struct device *dev) | |||
669 | 669 | ||
670 | /** | 670 | /** |
671 | * pci_cfg_space_size - get the configuration space size of the PCI device. | 671 | * pci_cfg_space_size - get the configuration space size of the PCI device. |
672 | * @dev: PCI device | ||
672 | * | 673 | * |
673 | * Regular PCI devices have 256 bytes, but PCI-X 2 and PCI Express devices | 674 | * Regular PCI devices have 256 bytes, but PCI-X 2 and PCI Express devices |
674 | * have 4096 bytes. Even if the device is capable, that doesn't mean we can | 675 | * have 4096 bytes. Even if the device is capable, that doesn't mean we can |