On Sun, 2 Jan 2022 12:55:36 +0000
Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
> From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
I'm going to drop this from v3 because of the clash with the namespace
patch that is already on list.
Once that's in I'll post an updated version with the a precursor patch
to add new PM macros to export the pm_ops in a namespace.
Jonathan
> ---
> drivers/iio/accel/kxsd9-i2c.c | 2 +-
> drivers/iio/accel/kxsd9-spi.c | 2 +-
> drivers/iio/accel/kxsd9.c | 8 ++------
> 3 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iio/accel/kxsd9-i2c.c b/drivers/iio/accel/kxsd9-i2c.c
> index 274b41a6e603..ffe8066b4025 100644
> --- a/drivers/iio/accel/kxsd9-i2c.c
> +++ b/drivers/iio/accel/kxsd9-i2c.c
> @@ -55,7 +55,7 @@ static struct i2c_driver kxsd9_i2c_driver = {
> .driver = {
> .name = "kxsd9",
> .of_match_table = kxsd9_of_match,
> - .pm = &kxsd9_dev_pm_ops,
> + .pm = pm_ptr(&kxsd9_dev_pm_ops),
> },
> .probe = kxsd9_i2c_probe,
> .remove = kxsd9_i2c_remove,
> diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c
> index 441e6b764281..44edf39fc5ff 100644
> --- a/drivers/iio/accel/kxsd9-spi.c
> +++ b/drivers/iio/accel/kxsd9-spi.c
> @@ -54,7 +54,7 @@ MODULE_DEVICE_TABLE(of, kxsd9_of_match);
> static struct spi_driver kxsd9_spi_driver = {
> .driver = {
> .name = "kxsd9",
> - .pm = &kxsd9_dev_pm_ops,
> + .pm = pm_ptr(&kxsd9_dev_pm_ops),
> .of_match_table = kxsd9_of_match,
> },
> .probe = kxsd9_spi_probe,
> diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
> index 552eba5e8b4f..39059ddca441 100644
> --- a/drivers/iio/accel/kxsd9.c
> +++ b/drivers/iio/accel/kxsd9.c
> @@ -492,7 +492,6 @@ void kxsd9_common_remove(struct device *dev)
> }
> EXPORT_SYMBOL(kxsd9_common_remove);
>
> -#ifdef CONFIG_PM
> static int kxsd9_runtime_suspend(struct device *dev)
> {
> struct iio_dev *indio_dev = dev_get_drvdata(dev);
> @@ -508,13 +507,10 @@ static int kxsd9_runtime_resume(struct device *dev)
>
> return kxsd9_power_up(st);
> }
> -#endif /* CONFIG_PM */
>
> const struct dev_pm_ops kxsd9_dev_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> - pm_runtime_force_resume)
> - SET_RUNTIME_PM_OPS(kxsd9_runtime_suspend,
> - kxsd9_runtime_resume, NULL)
> + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
> + RUNTIME_PM_OPS(kxsd9_runtime_suspend, kxsd9_runtime_resume, NULL)
> };
> EXPORT_SYMBOL(kxsd9_dev_pm_ops);
>
