From d22ec5ad852686412deafaedfbc4f62cb1160149 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 27 Jun 2012 23:26:26 +0200
Subject: [PATCH] --- yaml --- r: 312736 b: refs/heads/master c:
 e8110b64af8b7cce96d1878276770c76cb9c01d5 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/acpi/processor_driver.c | 6 ++++--
 trunk/drivers/acpi/processor_idle.c   | 4 ++--
 trunk/include/acpi/processor.h        | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ea4798055a41..3e4457e59b87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 167cffb646aa4a7f3267b07eae1af16b54bc0e9b
+refs/heads/master: e8110b64af8b7cce96d1878276770c76cb9c01d5
diff --git a/trunk/drivers/acpi/processor_driver.c b/trunk/drivers/acpi/processor_driver.c
index 0734086537b8..13103aeb0c4f 100644
--- a/trunk/drivers/acpi/processor_driver.c
+++ b/trunk/drivers/acpi/processor_driver.c
@@ -93,6 +93,9 @@ static const struct acpi_device_id processor_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, processor_device_ids);
 
+static SIMPLE_DEV_PM_OPS(acpi_processor_pm,
+			 acpi_processor_suspend, acpi_processor_resume);
+
 static struct acpi_driver acpi_processor_driver = {
 	.name = "processor",
 	.class = ACPI_PROCESSOR_CLASS,
@@ -100,10 +103,9 @@ static struct acpi_driver acpi_processor_driver = {
 	.ops = {
 		.add = acpi_processor_add,
 		.remove = acpi_processor_remove,
-		.suspend = acpi_processor_suspend,
-		.resume = acpi_processor_resume,
 		.notify = acpi_processor_notify,
 		},
+	.drv.pm = &acpi_processor_pm,
 };
 
 #define INSTALL_NOTIFY_HANDLER		1
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index e28af8d38239..6d9ec3e0b52e 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/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)
+int acpi_processor_suspend(struct device *dev)
 {
 	if (acpi_idle_suspend == 1)
 		return 0;
@@ -251,7 +251,7 @@ int acpi_processor_suspend(struct acpi_device * device)
 	return 0;
 }
 
-int acpi_processor_resume(struct acpi_device * device)
+int acpi_processor_resume(struct device *dev)
 {
 	if (acpi_idle_suspend == 0)
 		return 0;
diff --git a/trunk/include/acpi/processor.h b/trunk/include/acpi/processor.h
index 8a1894a6eba2..ac3bff6fbbb0 100644
--- a/trunk/include/acpi/processor.h
+++ b/trunk/include/acpi/processor.h
@@ -334,8 +334,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr);
 int acpi_processor_hotplug(struct acpi_processor *pr);
 int acpi_processor_power_exit(struct acpi_processor *pr,
 			      struct acpi_device *device);
-int acpi_processor_suspend(struct acpi_device * device);
-int acpi_processor_resume(struct acpi_device * device);
+int acpi_processor_suspend(struct device *dev);
+int acpi_processor_resume(struct device *dev);
 extern struct cpuidle_driver acpi_idle_driver;
 
 /* in processor_thermal.c */