toshiba_acpi: Use struct dev_pm_ops for power management

Make the toshiba_acpi driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct acpi_device_ops.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index fd90b6da0a4b..c13ba5bac93f 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1296,9 +1296,9 @@ static void toshiba_acpi_notify(struct acpi_device *acpi_dev, u32 event)
         }
 }
 
-static int toshiba_acpi_suspend(struct acpi_device *acpi_dev)
+static int toshiba_acpi_suspend(struct device *device)
 {
-        struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev);
+        struct toshiba_acpi_dev *dev = acpi_driver_data(to_acpi_device(device));
         u32 result;
 
         if (dev->hotkey_dev)
@@ -1307,9 +1307,9 @@ static int toshiba_acpi_suspend(struct acpi_device *acpi_dev)
         return 0;
 }
 
-static int toshiba_acpi_resume(struct acpi_device *acpi_dev)
+static int toshiba_acpi_resume(struct device *device)
 {
-        struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev);
+        struct toshiba_acpi_dev *dev = acpi_driver_data(to_acpi_device(device));
         u32 result;
 
         if (dev->hotkey_dev)
@@ -1318,6 +1318,9 @@ static int toshiba_acpi_resume(struct acpi_device *acpi_dev)
         return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(toshiba_acpi_pm,
+                         toshiba_acpi_suspend, toshiba_acpi_resume);
+
 static struct acpi_driver toshiba_acpi_driver = {
         .name   = "Toshiba ACPI driver",
         .owner  = THIS_MODULE,
@@ -1327,9 +1330,8 @@ static struct acpi_driver toshiba_acpi_driver = {
                 .add            = toshiba_acpi_add,
                 .remove         = toshiba_acpi_remove,
                 .notify         = toshiba_acpi_notify,
-                .suspend        = toshiba_acpi_suspend,
-                .resume         = toshiba_acpi_resume,
         },
+        .drv.pm = &toshiba_acpi_pm,
 };
 
 static int __init toshiba_acpi_init(void)