github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

PCI/PM: Clean up pci_set_low_power_state()

Browse Source 
Make the following assorted non-essential changes in
pci_set_low_power_state():

 1. Drop two redundant checks from it (the caller takes care of these
    conditions).

 2. Change the log level of a messages printed by it to "debug",
    because it only indicates a programming mistake.

Link: https://lore.kernel.org/r/2539071.Lt9SDvczpP@kreacher
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Rafael J. Wysocki 2022-05-05 20:15:34 +02:00 committed by Bjorn Helgaas
parent 0ce74a3b9c
commit 0aacdc9574
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/pci.c
View File

@ -1341,16 +1341,9 @@ static int pci_set_low_power_state(struct pci_dev *dev, pci_power_t state)
{ {
u16 pmcsr; u16 pmcsr;
/* Check if we're already there */
if (dev->current_state == state)
return 0;
if (!dev->pm_cap) if (!dev->pm_cap)
return -EIO; return -EIO;
if (state < PCI_D1 || state > PCI_D3hot)
return -EINVAL;
/* /*
* Validate transition: We can enter D0 from any state, but if * Validate transition: We can enter D0 from any state, but if
* we're already in a low-power state, we can only go deeper. E.g., * we're already in a low-power state, we can only go deeper. E.g.,
@ -1358,7 +1351,7 @@ static int pci_set_low_power_state(struct pci_dev *dev, pci_power_t state)
* we'd have to go from D3 to D0, then to D1. * we'd have to go from D3 to D0, then to D1.
*/ */
if (dev->current_state <= PCI_D3cold && dev->current_state > state) { if (dev->current_state <= PCI_D3cold && dev->current_state > state) {
pci_err(dev, "invalid power transition (from %s to %s)\n", pci_dbg(dev, "Invalid power transition (from %s to %s)\n",
pci_power_name(dev->current_state), pci_power_name(dev->current_state),
pci_power_name(state)); pci_power_name(state));
return -EINVAL; return -EINVAL;