OSDN Git Service

platform/x86: hp_accel: Use SIMPLE_DEV_PM_OPS() for PM ops
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 6 Dec 2021 15:15:21 +0000 (17:15 +0200)
committerHans de Goede <hdegoede@redhat.com>
Tue, 7 Dec 2021 11:21:01 +0000 (12:21 +0100)
After the commit 34570a898eef ("platform/x86: hp_accel: Remove
_INI method call") there is no need to have separate methods for
resume and restore, hence we may fold them together and use
SIMPLE_DEV_PM_OPS() for PM ops.

While at it, switch to use __maybe_unused attribute.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211206151521.22578-1-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/platform/x86/hp_accel.c

index 435a91f..e9f852f 100644 (file)
@@ -355,39 +355,20 @@ static int lis3lv02d_remove(struct platform_device *device)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int lis3lv02d_suspend(struct device *dev)
+static int __maybe_unused lis3lv02d_suspend(struct device *dev)
 {
        /* make sure the device is off when we suspend */
        lis3lv02d_poweroff(&lis3_dev);
        return 0;
 }
 
-static int lis3lv02d_resume(struct device *dev)
+static int __maybe_unused lis3lv02d_resume(struct device *dev)
 {
        lis3lv02d_poweron(&lis3_dev);
        return 0;
 }
 
-static int lis3lv02d_restore(struct device *dev)
-{
-       lis3lv02d_poweron(&lis3_dev);
-       return 0;
-}
-
-static const struct dev_pm_ops hp_accel_pm = {
-       .suspend = lis3lv02d_suspend,
-       .resume = lis3lv02d_resume,
-       .freeze = lis3lv02d_suspend,
-       .thaw = lis3lv02d_resume,
-       .poweroff = lis3lv02d_suspend,
-       .restore = lis3lv02d_restore,
-};
-
-#define HP_ACCEL_PM (&hp_accel_pm)
-#else
-#define HP_ACCEL_PM NULL
-#endif
+static SIMPLE_DEV_PM_OPS(hp_accel_pm, lis3lv02d_suspend, lis3lv02d_resume);
 
 /* For the HP MDPS aka 3D Driveguard */
 static struct platform_driver lis3lv02d_driver = {
@@ -395,7 +376,7 @@ static struct platform_driver lis3lv02d_driver = {
        .remove = lis3lv02d_remove,
        .driver = {
                .name   = "hp_accel",
-               .pm     = HP_ACCEL_PM,
+               .pm     = &hp_accel_pm,
                .acpi_match_table = lis3lv02d_device_ids,
        },
 };