]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
libata-acpi: set acpi state for SATA port
authorLin Ming <ming.m.lin@intel.com>
Mon, 25 Jun 2012 08:13:05 +0000 (16:13 +0800)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 29 Jun 2012 15:38:12 +0000 (11:38 -0400)
Currently, ata_acpi_set_state() only sets acpi sate for IDE port.
Remove this limitation.

Acked-by: Aaron Lu <aaron.lu@amd.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/ata/libata-acpi.c

index c6f0101fd2538c7dfcbfef46794c03e90e3e96c4..bb20fd597eb1ef0086a2103c44b2eaae5528c046 100644 (file)
@@ -852,23 +852,25 @@ 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;
 
        /* 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);
 }
 
 /**