| Message ID | 1347438597-5903-7-git-send-email-aaron.lu@intel.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 09/12/2012 04:29 AM, Aaron Lu wrote: > If user does not want the device to be powered off when runtime > suspended by setting may_power_off flag to 0, we will not choose > D3 cold for it. > > Signed-off-by: Aaron Lu <aaron.lu@intel.com> > --- > drivers/ata/libata-acpi.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c > index 9aca057..24347e0 100644 > --- a/drivers/ata/libata-acpi.c > +++ b/drivers/ata/libata-acpi.c > @@ -855,6 +855,7 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) > struct ata_device *dev; > acpi_handle handle; > int acpi_state, ret; > + bool power_off_allowed; > > /* channel first and then drives for power on and vica versa > for power off */ > @@ -868,9 +869,11 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) > continue; > > if (state.event != PM_EVENT_ON) { > + power_off_allowed = dev->sdev->ready_to_power_off && > + dev->sdev->may_power_off; > acpi_state = acpi_pm_device_sleep_state( > &dev->sdev->sdev_gendev, NULL, > - dev->sdev->ready_to_power_off ? > + power_off_allowed ? > ACPI_STATE_D3 : ACPI_STATE_D3_HOT); Acked-by: Jeff Garzik <jgarzik@redhat.com> with the same caveat as with the rest of this patchset: contingent upon acceptance of the other API changes. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 9aca057..24347e0 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -855,6 +855,7 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) struct ata_device *dev; acpi_handle handle; int acpi_state, ret; + bool power_off_allowed; /* channel first and then drives for power on and vica versa for power off */ @@ -868,9 +869,11 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) continue; if (state.event != PM_EVENT_ON) { + power_off_allowed = dev->sdev->ready_to_power_off && + dev->sdev->may_power_off; acpi_state = acpi_pm_device_sleep_state( &dev->sdev->sdev_gendev, NULL, - dev->sdev->ready_to_power_off ? + power_off_allowed ? ACPI_STATE_D3 : ACPI_STATE_D3_HOT); if (acpi_state > 0) { ret = acpi_bus_set_power(handle, acpi_state);
If user does not want the device to be powered off when runtime suspended by setting may_power_off flag to 0, we will not choose D3 cold for it. Signed-off-by: Aaron Lu <aaron.lu@intel.com> --- drivers/ata/libata-acpi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)