Hi,
On Thu, Mar 01, 2012 at 05:02:53PM +0800, Lin Ming wrote:
> Currently, ata_acpi_set_state() only sets acpi sate for IDE port.
> Remove this limitation.
>
> Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
> ---
> drivers/ata/libata-acpi.c | 21 ++++++++++++---------
> 1 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
> index b03e468..104c1d0 100644
> --- a/drivers/ata/libata-acpi.c
> +++ b/drivers/ata/libata-acpi.c
> @@ -841,23 +841,26 @@ void ata_acpi_on_resume(struct ata_port *ap)
> void ata_acpi_set_state(struct ata_port *ap, pm_message_t state)
> {
> struct ata_device *dev;
> -
> - if (!ata_ap_acpi_handle(ap) || (ap->flags & ATA_FLAG_ACPI_SATA))
> - return;
> + acpi_handle handle;
> + int acpi_state;
>
> /* channel first and then drives for power on and vica versa
> for power off */
> - if (state.event == PM_EVENT_ON)
> - acpi_bus_set_power(ata_ap_acpi_handle(ap), ACPI_STATE_D0);
> + handle = ata_ap_acpi_handle(ap);
> + if (handle && state.event == PM_EVENT_ON)
> + acpi_bus_set_power(handle, ACPI_STATE_D0);
>
> ata_for_each_dev(dev, &ap->link, ENABLED) {
> - if (ata_dev_acpi_handle(dev))
> - acpi_bus_set_power(ata_dev_acpi_handle(dev),
> + handle = ata_dev_acpi_handle(dev);
> + if (handle)
> + acpi_bus_set_power(handle,
> state.event == PM_EVENT_ON ?
> ACPI_STATE_D0 : ACPI_STATE_D3);
> }
> - if (state.event != PM_EVENT_ON)
> - acpi_bus_set_power(ata_ap_acpi_handle(ap), ACPI_STATE_D3);
> +
> + handle = ata_ap_acpi_handle(ap);
> + if (handle && state.event != PM_EVENT_ON)
> + acpi_bus_set_power(handle, ACPI_STATE_D3);
> }
>
> /**
Acked-by: Aaron Lu <aaron.lu@xxxxxxx>
> --
> 1.7.2.5
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
