aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-06-27 23:25:38 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-01 13:30:58 +0200
commit17621e11fda095459e2f986c019f52686c7a4ffb (patch)
treeb034b7594f751b49e83b61ebc58354b33cfa8fd4 /drivers/acpi
parent6887a4131da3adaab011613776d865f4bcfb5678 (diff)
downloadkernel_goldelico_gta04-17621e11fda095459e2f986c019f52686c7a4ffb.zip
kernel_goldelico_gta04-17621e11fda095459e2f986c019f52686c7a4ffb.tar.gz
kernel_goldelico_gta04-17621e11fda095459e2f986c019f52686c7a4ffb.tar.bz2
ACPI / PM: Drop pm_message_t argument from device suspend callback
None of the drivers implementing the ACPI device suspend callback uses the pm_message_t argument of it, so this argument may be dropped entirely from that callback. This will simplify switching the ACPI bus type to PM handling based on struct dev_pm_ops. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/fan.c4
-rw-r--r--drivers/acpi/processor_idle.c2
-rw-r--r--drivers/acpi/scan.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 0f0356c..ed1e58d 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL");
static int acpi_fan_add(struct acpi_device *device);
static int acpi_fan_remove(struct acpi_device *device, int type);
-static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state);
+static int acpi_fan_suspend(struct acpi_device *device);
static int acpi_fan_resume(struct acpi_device *device);
static const struct acpi_device_id fan_device_ids[] = {
@@ -183,7 +183,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type)
return 0;
}
-static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)
+static int acpi_fan_suspend(struct acpi_device *device)
{
if (!device)
return -EINVAL;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 47a8caa..e28af8d 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -241,7 +241,7 @@ static void acpi_idle_bm_rld_restore(void)
acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld);
}
-int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
+int acpi_processor_suspend(struct acpi_device * device)
{
if (acpi_idle_suspend == 1)
return 0;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c8a1f3b..ec65ec9 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -296,7 +296,7 @@ static int acpi_device_suspend(struct device *dev, pm_message_t state)
struct acpi_driver *acpi_drv = acpi_dev->driver;
if (acpi_drv && acpi_drv->ops.suspend)
- return acpi_drv->ops.suspend(acpi_dev, state);
+ return acpi_drv->ops.suspend(acpi_dev);
return 0;
}