]> git.baikalelectronics.ru Git - kernel.git/commitdiff
iio: light: us5182: Switch from CONFIG_PM guards to pm_ptr() etc
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 21 Jun 2022 20:27:09 +0000 (21:27 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 18 Jul 2022 17:48:18 +0000 (18:48 +0100)
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.

Very likely it would be safe to use DEFINE_RUNTIME_DEV_PM_OPS() here,
but that would be a functional change.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220621202719.13644-27-jic23@kernel.org
drivers/iio/light/us5182d.c

index cbd9978540fa546657a6d4feb0ea2799e551cdf5..80d2299da561563473ad9df50208b0d4b1792de1 100644 (file)
@@ -922,7 +922,6 @@ static int us5182d_remove(struct i2c_client *client)
        return 0;
 }
 
-#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM)
 static int us5182d_suspend(struct device *dev)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
@@ -945,11 +944,10 @@ static int us5182d_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
 static const struct dev_pm_ops us5182d_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(us5182d_suspend, us5182d_resume)
-       SET_RUNTIME_PM_OPS(us5182d_suspend, us5182d_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(us5182d_suspend, us5182d_resume)
+       RUNTIME_PM_OPS(us5182d_suspend, us5182d_resume, NULL)
 };
 
 static const struct acpi_device_id us5182d_acpi_match[] = {
@@ -975,7 +973,7 @@ MODULE_DEVICE_TABLE(of, us5182d_of_match);
 static struct i2c_driver us5182d_driver = {
        .driver = {
                .name = US5182D_DRV_NAME,
-               .pm = &us5182d_pm_ops,
+               .pm = pm_ptr(&us5182d_pm_ops),
                .of_match_table = us5182d_of_match,
                .acpi_match_table = ACPI_PTR(us5182d_acpi_match),
        },