diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-14 13:28:18 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-14 13:28:18 -0500 |
commit | f7625980f5820edd1a73536e1a03bcbc1f889fec (patch) | |
tree | 145e76f39b3e1d08d3e7a48a0993c0cd59088cc6 /drivers/pci/pci.c | |
parent | 4fbf888accb39af423f271111d44e8186f053723 (diff) |
PCI: Fix whitespace, capitalization, and spelling errors
Fix whitespace, capitalization, and spelling errors. No functional change.
I know "busses" is not an error, but "buses" was more common, so I used it
consistently.
Signed-off-by: Marta Rybczynska <rybczynska@gmail.com> (pci_reset_bridge_secondary_bus())
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b127fbda6fc8..33120d156668 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -198,7 +198,7 @@ static int __pci_bus_find_cap_start(struct pci_bus *bus, | |||
198 | } | 198 | } |
199 | 199 | ||
200 | /** | 200 | /** |
201 | * pci_find_capability - query for devices' capabilities | 201 | * pci_find_capability - query for devices' capabilities |
202 | * @dev: PCI device to query | 202 | * @dev: PCI device to query |
203 | * @cap: capability code | 203 | * @cap: capability code |
204 | * | 204 | * |
@@ -207,12 +207,12 @@ static int __pci_bus_find_cap_start(struct pci_bus *bus, | |||
207 | * device's PCI configuration space or 0 in case the device does not | 207 | * device's PCI configuration space or 0 in case the device does not |
208 | * support it. Possible values for @cap: | 208 | * support it. Possible values for @cap: |
209 | * | 209 | * |
210 | * %PCI_CAP_ID_PM Power Management | 210 | * %PCI_CAP_ID_PM Power Management |
211 | * %PCI_CAP_ID_AGP Accelerated Graphics Port | 211 | * %PCI_CAP_ID_AGP Accelerated Graphics Port |
212 | * %PCI_CAP_ID_VPD Vital Product Data | 212 | * %PCI_CAP_ID_VPD Vital Product Data |
213 | * %PCI_CAP_ID_SLOTID Slot Identification | 213 | * %PCI_CAP_ID_SLOTID Slot Identification |
214 | * %PCI_CAP_ID_MSI Message Signalled Interrupts | 214 | * %PCI_CAP_ID_MSI Message Signalled Interrupts |
215 | * %PCI_CAP_ID_CHSWP CompactPCI HotSwap | 215 | * %PCI_CAP_ID_CHSWP CompactPCI HotSwap |
216 | * %PCI_CAP_ID_PCIX PCI-X | 216 | * %PCI_CAP_ID_PCIX PCI-X |
217 | * %PCI_CAP_ID_EXP PCI Express | 217 | * %PCI_CAP_ID_EXP PCI Express |
218 | */ | 218 | */ |
@@ -228,13 +228,13 @@ int pci_find_capability(struct pci_dev *dev, int cap) | |||
228 | } | 228 | } |
229 | 229 | ||
230 | /** | 230 | /** |
231 | * pci_bus_find_capability - query for devices' capabilities | 231 | * pci_bus_find_capability - query for devices' capabilities |
232 | * @bus: the PCI bus to query | 232 | * @bus: the PCI bus to query |
233 | * @devfn: PCI device to query | 233 | * @devfn: PCI device to query |
234 | * @cap: capability code | 234 | * @cap: capability code |
235 | * | 235 | * |
236 | * Like pci_find_capability() but works for pci devices that do not have a | 236 | * Like pci_find_capability() but works for pci devices that do not have a |
237 | * pci_dev structure set up yet. | 237 | * pci_dev structure set up yet. |
238 | * | 238 | * |
239 | * Returns the address of the requested capability structure within the | 239 | * Returns the address of the requested capability structure within the |
240 | * device's PCI configuration space or 0 in case the device does not | 240 | * device's PCI configuration space or 0 in case the device does not |
@@ -515,7 +515,7 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
515 | return -EINVAL; | 515 | return -EINVAL; |
516 | 516 | ||
517 | /* Validate current state: | 517 | /* Validate current state: |
518 | * Can enter D0 from any state, but if we can only go deeper | 518 | * Can enter D0 from any state, but if we can only go deeper |
519 | * to sleep if we're already in a low power state | 519 | * to sleep if we're already in a low power state |
520 | */ | 520 | */ |
521 | if (state != PCI_D0 && dev->current_state <= PCI_D3cold | 521 | if (state != PCI_D0 && dev->current_state <= PCI_D3cold |
@@ -998,7 +998,7 @@ static void pci_restore_config_space(struct pci_dev *pdev) | |||
998 | } | 998 | } |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | /** | 1001 | /** |
1002 | * pci_restore_state - Restore the saved state of a PCI device | 1002 | * pci_restore_state - Restore the saved state of a PCI device |
1003 | * @dev: - PCI device that we're dealing with | 1003 | * @dev: - PCI device that we're dealing with |
1004 | */ | 1004 | */ |
@@ -1030,7 +1030,7 @@ struct pci_saved_state { | |||
1030 | * the device saved state. | 1030 | * the device saved state. |
1031 | * @dev: PCI device that we're dealing with | 1031 | * @dev: PCI device that we're dealing with |
1032 | * | 1032 | * |
1033 | * Rerturn NULL if no state or error. | 1033 | * Return NULL if no state or error. |
1034 | */ | 1034 | */ |
1035 | struct pci_saved_state *pci_store_saved_state(struct pci_dev *dev) | 1035 | struct pci_saved_state *pci_store_saved_state(struct pci_dev *dev) |
1036 | { | 1036 | { |
@@ -1880,7 +1880,7 @@ int pci_finish_runtime_suspend(struct pci_dev *dev) | |||
1880 | * pci_dev_run_wake - Check if device can generate run-time wake-up events. | 1880 | * pci_dev_run_wake - Check if device can generate run-time wake-up events. |
1881 | * @dev: Device to check. | 1881 | * @dev: Device to check. |
1882 | * | 1882 | * |
1883 | * Return true if the device itself is cabable of generating wake-up events | 1883 | * Return true if the device itself is capable of generating wake-up events |
1884 | * (through the platform or using the native PCIe PME) or if the device supports | 1884 | * (through the platform or using the native PCIe PME) or if the device supports |
1885 | * PME and one of its upstream bridges can generate wake-up events. | 1885 | * PME and one of its upstream bridges can generate wake-up events. |
1886 | */ | 1886 | */ |
@@ -2447,7 +2447,7 @@ bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags) | |||
2447 | switch (pci_pcie_type(pdev)) { | 2447 | switch (pci_pcie_type(pdev)) { |
2448 | /* | 2448 | /* |
2449 | * PCI/X-to-PCIe bridges are not specifically mentioned by the spec, | 2449 | * PCI/X-to-PCIe bridges are not specifically mentioned by the spec, |
2450 | * but since their primary inteface is PCI/X, we conservatively | 2450 | * but since their primary interface is PCI/X, we conservatively |
2451 | * handle them as we would a non-PCIe device. | 2451 | * handle them as we would a non-PCIe device. |
2452 | */ | 2452 | */ |
2453 | case PCI_EXP_TYPE_PCIE_BRIDGE: | 2453 | case PCI_EXP_TYPE_PCIE_BRIDGE: |
@@ -2471,7 +2471,7 @@ bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags) | |||
2471 | /* | 2471 | /* |
2472 | * PCIe 3.0, 6.12.1.2 specifies ACS capabilities that should be | 2472 | * PCIe 3.0, 6.12.1.2 specifies ACS capabilities that should be |
2473 | * implemented by the remaining PCIe types to indicate peer-to-peer | 2473 | * implemented by the remaining PCIe types to indicate peer-to-peer |
2474 | * capabilities, but only when they are part of a multifunciton | 2474 | * capabilities, but only when they are part of a multifunction |
2475 | * device. The footnote for section 6.12 indicates the specific | 2475 | * device. The footnote for section 6.12 indicates the specific |
2476 | * PCIe types included here. | 2476 | * PCIe types included here. |
2477 | */ | 2477 | */ |
@@ -2486,7 +2486,7 @@ bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags) | |||
2486 | } | 2486 | } |
2487 | 2487 | ||
2488 | /* | 2488 | /* |
2489 | * PCIe 3.0, 6.12.1.3 specifies no ACS capabilties are applicable | 2489 | * PCIe 3.0, 6.12.1.3 specifies no ACS capabilities are applicable |
2490 | * to single function devices with the exception of downstream ports. | 2490 | * to single function devices with the exception of downstream ports. |
2491 | */ | 2491 | */ |
2492 | return true; | 2492 | return true; |
@@ -2622,7 +2622,7 @@ void pci_release_region(struct pci_dev *pdev, int bar) | |||
2622 | * | 2622 | * |
2623 | * If @exclusive is set, then the region is marked so that userspace | 2623 | * If @exclusive is set, then the region is marked so that userspace |
2624 | * is explicitly not allowed to map the resource via /dev/mem or | 2624 | * is explicitly not allowed to map the resource via /dev/mem or |
2625 | * sysfs MMIO access. | 2625 | * sysfs MMIO access. |
2626 | * | 2626 | * |
2627 | * Returns 0 on success, or %EBUSY on error. A warning | 2627 | * Returns 0 on success, or %EBUSY on error. A warning |
2628 | * message is also printed on failure. | 2628 | * message is also printed on failure. |
@@ -2634,7 +2634,7 @@ static int __pci_request_region(struct pci_dev *pdev, int bar, const char *res_n | |||
2634 | 2634 | ||
2635 | if (pci_resource_len(pdev, bar) == 0) | 2635 | if (pci_resource_len(pdev, bar) == 0) |
2636 | return 0; | 2636 | return 0; |
2637 | 2637 | ||
2638 | if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) { | 2638 | if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) { |
2639 | if (!request_region(pci_resource_start(pdev, bar), | 2639 | if (!request_region(pci_resource_start(pdev, bar), |
2640 | pci_resource_len(pdev, bar), res_name)) | 2640 | pci_resource_len(pdev, bar), res_name)) |
@@ -2694,7 +2694,7 @@ int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) | |||
2694 | * | 2694 | * |
2695 | * The key difference that _exclusive makes it that userspace is | 2695 | * The key difference that _exclusive makes it that userspace is |
2696 | * explicitly not allowed to map the resource via /dev/mem or | 2696 | * explicitly not allowed to map the resource via /dev/mem or |
2697 | * sysfs. | 2697 | * sysfs. |
2698 | */ | 2698 | */ |
2699 | int pci_request_region_exclusive(struct pci_dev *pdev, int bar, const char *res_name) | 2699 | int pci_request_region_exclusive(struct pci_dev *pdev, int bar, const char *res_name) |
2700 | { | 2700 | { |
@@ -2799,7 +2799,7 @@ int pci_request_regions(struct pci_dev *pdev, const char *res_name) | |||
2799 | * successfully. | 2799 | * successfully. |
2800 | * | 2800 | * |
2801 | * pci_request_regions_exclusive() will mark the region so that | 2801 | * pci_request_regions_exclusive() will mark the region so that |
2802 | * /dev/mem and the sysfs MMIO access will not be allowed. | 2802 | * /dev/mem and the sysfs MMIO access will not be allowed. |
2803 | * | 2803 | * |
2804 | * Returns 0 on success, or %EBUSY on error. A warning | 2804 | * Returns 0 on success, or %EBUSY on error. A warning |
2805 | * message is also printed on failure. | 2805 | * message is also printed on failure. |
@@ -2967,7 +2967,7 @@ pci_set_mwi(struct pci_dev *dev) | |||
2967 | cmd |= PCI_COMMAND_INVALIDATE; | 2967 | cmd |= PCI_COMMAND_INVALIDATE; |
2968 | pci_write_config_word(dev, PCI_COMMAND, cmd); | 2968 | pci_write_config_word(dev, PCI_COMMAND, cmd); |
2969 | } | 2969 | } |
2970 | 2970 | ||
2971 | return 0; | 2971 | return 0; |
2972 | } | 2972 | } |
2973 | 2973 | ||
@@ -3292,7 +3292,7 @@ clear: | |||
3292 | * | 3292 | * |
3293 | * NOTE: This causes the caller to sleep for twice the device power transition | 3293 | * NOTE: This causes the caller to sleep for twice the device power transition |
3294 | * cooldown period, which for the D0->D3hot and D3hot->D0 transitions is 10 ms | 3294 | * cooldown period, which for the D0->D3hot and D3hot->D0 transitions is 10 ms |
3295 | * by devault (i.e. unless the @dev's d3_delay field has a different value). | 3295 | * by default (i.e. unless the @dev's d3_delay field has a different value). |
3296 | * Moreover, only devices in D0 can be reset by this function. | 3296 | * Moreover, only devices in D0 can be reset by this function. |
3297 | */ | 3297 | */ |
3298 | static int pci_pm_reset(struct pci_dev *dev, int probe) | 3298 | static int pci_pm_reset(struct pci_dev *dev, int probe) |
@@ -3341,7 +3341,7 @@ void pci_reset_bridge_secondary_bus(struct pci_dev *dev) | |||
3341 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl); | 3341 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl); |
3342 | /* | 3342 | /* |
3343 | * PCI spec v3.0 7.6.4.2 requires minimum Trst of 1ms. Double | 3343 | * PCI spec v3.0 7.6.4.2 requires minimum Trst of 1ms. Double |
3344 | * this to 2ms to ensure that we meet the minium requirement. | 3344 | * this to 2ms to ensure that we meet the minimum requirement. |
3345 | */ | 3345 | */ |
3346 | msleep(2); | 3346 | msleep(2); |
3347 | 3347 | ||
@@ -3998,7 +3998,7 @@ int pcie_set_mps(struct pci_dev *dev, int mps) | |||
3998 | return -EINVAL; | 3998 | return -EINVAL; |
3999 | 3999 | ||
4000 | v = ffs(mps) - 8; | 4000 | v = ffs(mps) - 8; |
4001 | if (v > dev->pcie_mpss) | 4001 | if (v > dev->pcie_mpss) |
4002 | return -EINVAL; | 4002 | return -EINVAL; |
4003 | v <<= 5; | 4003 | v <<= 5; |
4004 | 4004 | ||