Merge tag 'vfs-5.18-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / drivers / iio / accel / mma9553.c

diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index 5ff6bc7..09df58d 100644 (file)
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -1165,7 +1165,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));
@@ -1197,9 +1196,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));
@@ -1225,12 +1222,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[] = {
@@ -1251,7 +1246,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,
@@ -1263,3 +1258,4 @@ module_i2c_driver(mma9553_driver);
 MODULE_AUTHOR("Irina Tirdea <irina.tirdea@intel.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("MMA9553L pedometer platform driver");
+MODULE_IMPORT_NS(IIO_MMA9551);