[PATCH v1 09/11] PCI/PM: Clean up pci_set_low_power_state()

Rafael J. Wysocki
2022-05-05T18:33:38Z

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.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/pci/pci.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)

Index: linux-pm/drivers/pci/pci.c
===================================================================
--- linux-pm.orig/drivers/pci/pci.c
+++ linux-pm/drivers/pci/pci.c
@@ -1341,16 +1341,9 @@ static int pci_set_low_power_state(struc
{
u16 pmcsr;

- /* Check if we're already there */
- if (dev->current_state == state)
- return 0;
-
if (!dev->pm_cap)
return -EIO;

- if (state < PCI_D1 || state > PCI_D3hot)
- return -EINVAL;
-
/*
* 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.,
@@ -1358,7 +1351,7 @@ static int pci_set_low_power_state(struc
* we'd have to go from D3 to D0, then to D1.
*/
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(state));
return -EINVAL;