diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-09-29 20:11:18 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-10-05 15:38:05 +0200 |
| commit | 6407e5ecdc66cd9da760e751a7c092c87a683861 (patch) | |
| tree | ad2baef3e00f4d0ccf24aa414e6637e929eb2b72 /drivers/pci/pci-acpi.c | |
| parent | bf39c929f9053cd840155a1c39494c9a9946836b (diff) | |
| download | linux-6407e5ecdc66cd9da760e751a7c092c87a683861.tar.gz linux-6407e5ecdc66cd9da760e751a7c092c87a683861.tar.bz2 linux-6407e5ecdc66cd9da760e751a7c092c87a683861.zip | |
PCI: PM: Make pci_choose_state() call pci_target_state()
The pci_choose_state() and pci_target_state() implementations are
somewhat divergent without a good reason, because they are used
for similar purposes.
Change the pci_choose_state() implementation to use pci_target_state()
internally except for transitions to the working state of the system
in which case it is expected to return D0.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Ferry Toth <fntoth@gmail.com>
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 9663b13944ad..889dc8c0d409 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -910,9 +910,6 @@ pci_power_t acpi_pci_choose_state(struct pci_dev *pdev) { int acpi_state, d_max; - if (acpi_pci_disabled) - return PCI_POWER_ERROR; - if (pdev->no_d3cold) d_max = ACPI_STATE_D3_HOT; else |