ACPI / PM: Sanitize checks in acpi_power_on_resources()

After the only user of acpi_power_on_resources(),
acpi_bus_init_power(), has been changed to avoid calling it
for state equal to ACPI_STATE_D3_COLD, it doesn't have to special
case that state any more.

For this reason, modify the checks in acpi_power_on_resources()
so that it returns -EINVAL for ACPI_STATE_D3_COLD as it should.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 089a7c39348fe676429a64afec817539811f8d65..6db261c237d4a2cb833690bb1518c679e616b95f 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -622,12 +622,9 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
 
 int acpi_power_on_resources(struct acpi_device *device, int state)
 {
-       if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_COLD)
+       if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_HOT)
                return -EINVAL;
 
-       if (state == ACPI_STATE_D3_COLD)
-               return 0;
-
        return acpi_power_on_list(&device->power.states[state].resources);
 }