diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-02 03:50:39 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-02 03:50:39 +0400 |
| commit | 0345d3f8b2dc761fdebc009093d01c6cec4f11f7 (patch) | |
| tree | 850d0e0b6d363953fd8c23ec43ce2826a53ce32b /drivers/pci/pcie | |
| parent | b194dbf5eeb4542ff350e30981256c9cb23033fb (diff) | |
| parent | 9a994e8ec7e7d6b1a66c74a683596b0f38f4e345 (diff) | |
| download | linux-0345d3f8b2dc761fdebc009093d01c6cec4f11f7.tar.xz | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Replace strict_strtoul() with kstrtoul()
PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPM
PCI: Replace printks with appropriate pr_*()
PCI: Fix kerneldoc for pci_disable_link_state()
x86/PCI: Increase info->res_num before checking pci_use_crs
PCI: Fix INTC comment typo for pci_swizzle_interrupt_pin()
PCI: Convert ioapic.c to module_pci_driver
Diffstat (limited to 'drivers/pci/pcie')
| -rw-r--r-- | drivers/pci/pcie/aspm.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index faa83b632a84..403a44374ed5 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -714,10 +714,6 @@ void pcie_aspm_powersave_config_link(struct pci_dev *pdev) up_read(&pci_bus_sem); } -/* - * pci_disable_link_state - disable pci device's link state, so the link will - * never enter specific states - */ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem, bool force) { @@ -771,6 +767,15 @@ void pci_disable_link_state_locked(struct pci_dev *pdev, int state) } EXPORT_SYMBOL(pci_disable_link_state_locked); +/** + * pci_disable_link_state - Disable device's link state, so the link will + * never enter specific states. Note that if the BIOS didn't grant ASPM + * control to the OS, this does nothing because we can't touch the LNKCTL + * register. + * + * @pdev: PCI device + * @state: ASPM link state to disable + */ void pci_disable_link_state(struct pci_dev *pdev, int state) { __pci_disable_link_state(pdev, state, true, false); |