iio: gyro: mpu3050: Use pm_ptr() and DEFINE_RUNTIME_DEV_PM_OPS()

Using this approach as opposed to CONFIG_PM guards allows the compiler to
remove the unused code instead of doing it manually.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220220175149.503495-3-jic23@kernel.org

diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
index 4941a2f17d2263eead17deba52878f82623542dd..c015a0c514ed2c39804c6992d9d6b3be2d5ba07d 100644 (file)
--- a/drivers/iio/gyro/mpu3050-core.c
+++ b/drivers/iio/gyro/mpu3050-core.c
@@ -1277,7 +1277,6 @@ void mpu3050_common_remove(struct device *dev)
        mpu3050_power_down(mpu3050);
 }
 
-#ifdef CONFIG_PM
 static int mpu3050_runtime_suspend(struct device *dev)
 {
        return mpu3050_power_down(iio_priv(dev_get_drvdata(dev)));
@@ -1287,15 +1286,9 @@ static int mpu3050_runtime_resume(struct device *dev)
 {
        return mpu3050_power_up(iio_priv(dev_get_drvdata(dev)));
 }
-#endif /* CONFIG_PM */
-
-const struct dev_pm_ops mpu3050_dev_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-                               pm_runtime_force_resume)
-       SET_RUNTIME_PM_OPS(mpu3050_runtime_suspend,
-                          mpu3050_runtime_resume, NULL)
-};
 
+DEFINE_RUNTIME_DEV_PM_OPS(mpu3050_dev_pm_ops, mpu3050_runtime_suspend,
+                         mpu3050_runtime_resume, NULL);
 MODULE_AUTHOR("Linus Walleij");
 MODULE_DESCRIPTION("MPU3050 gyroscope driver");
 MODULE_LICENSE("GPL");

diff --git a/drivers/iio/gyro/mpu3050-i2c.c b/drivers/iio/gyro/mpu3050-i2c.c
index 5b5f58baaf7fd9324897a0153717fc3adf72bb78..78f4a0102986ecd36cf4d9576e3078a7454d2b09 100644 (file)
--- a/drivers/iio/gyro/mpu3050-i2c.c
+++ b/drivers/iio/gyro/mpu3050-i2c.c
@@ -116,7 +116,7 @@ static struct i2c_driver mpu3050_i2c_driver = {
        .driver = {
                .of_match_table = mpu3050_i2c_of_match,
                .name = "mpu3050-i2c",
-               .pm = &mpu3050_dev_pm_ops,
+               .pm = pm_ptr(&mpu3050_dev_pm_ops),
        },
 };
 module_i2c_driver(mpu3050_i2c_driver);