iio:accel:mma9553: Switch from CONFIG_PM guards to pm_ptr() etc
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 30 Jan 2022 19:31:05 +0000 (19:31 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Fri, 18 Feb 2022 11:43:11 +0000 (11:43 +0000)
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM support is simpler and less error prone than the
use of #ifdef based config guards.

Removing instances of this approach from IIO also stops them being
copied into new drivers.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220130193147.279148-9-jic23@kernel.org
drivers/iio/accel/mma9553.c

index a836e73c3242217a2352685c9d51da15d851d63c..3e2dc8cff87516c1df398c0436529bb29375a51e 100644 (file)
@@ -1162,7 +1162,6 @@ static int mma9553_remove(struct i2c_client *client)
        return 0;
 }
 
-#ifdef CONFIG_PM
 static int mma9553_runtime_suspend(struct device *dev)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
@@ -1194,9 +1193,7 @@ static int mma9553_runtime_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
-#ifdef CONFIG_PM_SLEEP
 static int mma9553_suspend(struct device *dev)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
@@ -1222,12 +1219,10 @@ static int mma9553_resume(struct device *dev)
 
        return ret;
 }
-#endif
 
 static const struct dev_pm_ops mma9553_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(mma9553_suspend, mma9553_resume)
-       SET_RUNTIME_PM_OPS(mma9553_runtime_suspend,
-                          mma9553_runtime_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(mma9553_suspend, mma9553_resume)
+       RUNTIME_PM_OPS(mma9553_runtime_suspend, mma9553_runtime_resume, NULL)
 };
 
 static const struct acpi_device_id mma9553_acpi_match[] = {
@@ -1248,7 +1243,7 @@ static struct i2c_driver mma9553_driver = {
        .driver = {
                   .name = MMA9553_DRV_NAME,
                   .acpi_match_table = ACPI_PTR(mma9553_acpi_match),
-                  .pm = &mma9553_pm_ops,
+                  .pm = pm_ptr(&mma9553_pm_ops),
                   },
        .probe = mma9553_probe,
        .remove = mma9553_remove,