Commit 354b2eac authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Jeff Garzik

libata-acpi: fix up for acpi_pm_device_sleep_state API

After merging the libata tree, today's [2012-07-01] linux-next build (x86_64
allmodconfig) failed like this:

drivers/ata/libata-acpi.c: In function 'ata_acpi_set_state':
drivers/ata/libata-acpi.c:872:5: error: too few arguments to function 'acpi_pm_device_sleep_state'
include/acpi/acpi_bus.h:418:5: note: declared here

Caused by commit 3bd46600 ("libata-acpi: add ata port runtime D3Cold
support") from the libata tree interacting with commit ee85f543
("ACPI/PM: specify lowest allowed state for device sleep state") from the
pci tree.

This patch adds ACPI_STATE_D3 as the new third parameter to
acpi_pm_device_sleep_state()
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 8407884d
...@@ -869,7 +869,7 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) ...@@ -869,7 +869,7 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state)
if (state.event != PM_EVENT_ON) { if (state.event != PM_EVENT_ON) {
acpi_state = acpi_pm_device_sleep_state( acpi_state = acpi_pm_device_sleep_state(
&dev->sdev->sdev_gendev, NULL); &dev->sdev->sdev_gendev, NULL, ACPI_STATE_D3);
if (acpi_state > 0) if (acpi_state > 0)
acpi_bus_set_power(handle, acpi_state); acpi_bus_set_power(handle, acpi_state);
/* TBD: need to check if it's runtime pm request */ /* TBD: need to check if it's runtime pm request */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment