On Tue, 23 Nov 2021 21:10:18 +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>
> Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Another one I'm going to drop for now because the multiple module
nature of it means the compiler can't tell what it can remove.
Needs more thought.
Thanks,
Jonathan
> ---
> drivers/iio/gyro/mpu3050-core.c | 8 +++-----
> drivers/iio/gyro/mpu3050-i2c.c | 2 +-
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
> index ea387efab62d..4ec107b9e779 100644
> --- a/drivers/iio/gyro/mpu3050-core.c
> +++ b/drivers/iio/gyro/mpu3050-core.c
> @@ -1281,19 +1281,17 @@ int mpu3050_common_remove(struct device *dev)
> }
> EXPORT_SYMBOL(mpu3050_common_remove);
>
> -#ifdef CONFIG_PM
> -static int mpu3050_runtime_suspend(struct device *dev)
> +static __maybe_unused int mpu3050_runtime_suspend(struct device *dev)
> {
> return mpu3050_power_down(iio_priv(dev_get_drvdata(dev)));
> }
>
> -static int mpu3050_runtime_resume(struct device *dev)
> +static __maybe_unused 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 = {
> +const __maybe_unused 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,
> diff --git a/drivers/iio/gyro/mpu3050-i2c.c b/drivers/iio/gyro/mpu3050-i2c.c
> index ef5bcbc4b45b..820133cad601 100644
> --- a/drivers/iio/gyro/mpu3050-i2c.c
> +++ b/drivers/iio/gyro/mpu3050-i2c.c
> @@ -114,7 +114,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);
