Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ad4c9a9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pm' 

* acpi-pm:
  ACPI / PM: Add state information to error message in acpi_device_set_power()
  ACPI / PM: Remove redundant power manageable check from acpi_bus_set_power()
  ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
  ACPI / PM: Make messages in acpi_device_set_power() print device names
  ACPI / PM: Only set power states of devices that are power manageable
parents abe5430e 593298e6

drivers/acpi/device_pm.c

+14 −20
Original line number Diff line number Diff line
@@ -159,26 +159,29 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
	int result = 0;

	bool cut_power = false;



	if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))

	if (!device || !device->flags.power_manageable

	    || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))

		return -EINVAL;



	/* Make sure this is a valid target state */



	if (state == device->power.state) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at %s\n",

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] already in %s\n",

				  device->pnp.bus_id,

				  acpi_power_state_string(state)));

		return 0;

	}



	if (!device->power.states[state].flags.valid) {

		printk(KERN_WARNING PREFIX "Device does not support %s\n",

		dev_warn(&device->dev, "Power state %s not supported\n",

			 acpi_power_state_string(state));

		return -ENODEV;

	}

	if (device->parent && (state < device->parent->power.state)) {

		printk(KERN_WARNING PREFIX

			      "Cannot set device to a higher-powered"

			      " state than parent\n");

		dev_warn(&device->dev,

			 "Cannot transition to power state %s for parent in %s\n",

			 acpi_power_state_string(state),

			 acpi_power_state_string(device->parent->power.state));

		return -ENODEV;

	}
@@ -191,7 +194,7 @@ int acpi_device_set_power(struct acpi_device *device, int state) 


	if (state < device->power.state && state != ACPI_STATE_D0

	    && device->power.state >= ACPI_STATE_D3_HOT) {

		printk(KERN_WARNING PREFIX

		dev_warn(&device->dev,

			 "Cannot transition to non-D0 state from D3\n");

		return -ENODEV;

	}
@@ -219,9 +222,7 @@ int acpi_device_set_power(struct acpi_device *device, int state) 


 end:

	if (result) {

		printk(KERN_WARNING PREFIX

			      "Device [%s] failed to transition to %s\n",

			      device->pnp.bus_id,

		dev_warn(&device->dev, "Failed to change power state to %s\n",

			 acpi_power_state_string(state));

	} else {

		device->power.state = state;
@@ -244,13 +245,6 @@ int acpi_bus_set_power(acpi_handle handle, int state) 
	if (result)

		return result;



	if (!device->flags.power_manageable) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				"Device [%s] is not power manageable\n",

				dev_name(&device->dev)));

		return -ENODEV;

	}



	return acpi_device_set_power(device, state);

}

EXPORT_SYMBOL(acpi_bus_set_power);

drivers/acpi/fan.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long 
	if (result)

		return result;



	*state = (acpi_state == ACPI_STATE_D3 ? 0 :

	*state = (acpi_state == ACPI_STATE_D3_COLD ? 0 :

		 (acpi_state == ACPI_STATE_D0 ? 1 : -1));

	return 0;

}
@@ -108,7 +108,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) 
		return -EINVAL;



	result = acpi_bus_set_power(device->handle,

				state ? ACPI_STATE_D0 : ACPI_STATE_D3);

				state ? ACPI_STATE_D0 : ACPI_STATE_D3_COLD);



	return result;

}

drivers/acpi/power.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state) 
		}

	}



	*state = ACPI_STATE_D3;

	*state = ACPI_STATE_D3_COLD;

	return 0;

}

drivers/acpi/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -1409,8 +1409,8 @@ static void acpi_bus_get_power_flags(struct acpi_device *device) 
	/* Set defaults for D0 and D3 states (always valid) */

	device->power.states[ACPI_STATE_D0].flags.valid = 1;

	device->power.states[ACPI_STATE_D0].power = 100;

	device->power.states[ACPI_STATE_D3].flags.valid = 1;

	device->power.states[ACPI_STATE_D3].power = 0;

	device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1;

	device->power.states[ACPI_STATE_D3_COLD].power = 0;



	/* Set D3cold's explicit_set flag if _PS3 exists. */

	if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set)

drivers/ata/libata-acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -947,11 +947,11 @@ static void pata_acpi_set_state(struct ata_port *ap, pm_message_t state) 
			continue;



		acpi_bus_set_power(dev_handle, state.event & PM_EVENT_RESUME ?

						ACPI_STATE_D0 : ACPI_STATE_D3);

					ACPI_STATE_D0 : ACPI_STATE_D3_COLD);

	}



	if (!(state.event & PM_EVENT_RESUME))

		acpi_bus_set_power(port_handle, ACPI_STATE_D3);

		acpi_bus_set_power(port_handle, ACPI_STATE_D3_COLD);

}



/**