iio:accel:mma9551: Switch from CONFIG_PM guards to pm_ptr() etc

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-8-jic23@kernel.org

diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c
index 8709c53..ada0ee0 100644 (file)
--- a/drivers/iio/accel/mma9551.c
+++ b/drivers/iio/accel/mma9551.c
@@ -523,7 +523,6 @@ static int mma9551_remove(struct i2c_client *client)
        return 0;
 }
 
-#ifdef CONFIG_PM
 static int mma9551_runtime_suspend(struct device *dev)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
@@ -555,9 +554,7 @@ static int mma9551_runtime_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
-#ifdef CONFIG_PM_SLEEP
 static int mma9551_suspend(struct device *dev)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
@@ -583,12 +580,10 @@ static int mma9551_resume(struct device *dev)
 
        return ret;
 }
-#endif
 
 static const struct dev_pm_ops mma9551_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(mma9551_suspend, mma9551_resume)
-       SET_RUNTIME_PM_OPS(mma9551_runtime_suspend,
-                          mma9551_runtime_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(mma9551_suspend, mma9551_resume)
+       RUNTIME_PM_OPS(mma9551_runtime_suspend, mma9551_runtime_resume, NULL)
 };
 
 static const struct acpi_device_id mma9551_acpi_match[] = {
@@ -609,7 +604,7 @@ static struct i2c_driver mma9551_driver = {
        .driver = {
                   .name = MMA9551_DRV_NAME,
                   .acpi_match_table = ACPI_PTR(mma9551_acpi_match),
-                  .pm = &mma9551_pm_ops,
+                  .pm = pm_ptr(&mma9551_pm_ops),
                   },
        .probe = mma9551_probe,
        .remove = mma9551_remove,