On Tue, 4 Jan 2022 21:42:14 +0000
Paul Cercueil <paul@xxxxxxxxxxxxxxx> wrote:
> Use the new EXPORT_RUNTIME_DEV_PM_OPS() macro. It allows the underlying
> dev_pm_ops struct as well as the suspend/resume callbacks to be detected
> as dead code in the case where CONFIG_PM is disabled, without having to
> wrap everything inside #ifdef CONFIG_PM guards.
>
> Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Hohum - bad choice of example. These shouldn't be exported as only used within
the same module ;) No one ever wrote the other bus interface (and the part is
ancient so I can't see it happening now) hence whilst there are two files, they
are built into a single module. There is a comment about this in the Makefile.
Jonathan
> ---
> drivers/iio/gyro/mpu3050-core.c | 13 ++++---------
> drivers/iio/gyro/mpu3050-i2c.c | 2 +-
> 2 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
> index ea387efab62d..7d6721e268fe 100644
> --- a/drivers/iio/gyro/mpu3050-core.c
> +++ b/drivers/iio/gyro/mpu3050-core.c
> @@ -1281,7 +1281,6 @@ int mpu3050_common_remove(struct device *dev)
> }
> EXPORT_SYMBOL(mpu3050_common_remove);
>
> -#ifdef CONFIG_PM
> static int mpu3050_runtime_suspend(struct device *dev)
> {
> return mpu3050_power_down(iio_priv(dev_get_drvdata(dev)));
> @@ -1291,15 +1290,11 @@ 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)
> -};
> -EXPORT_SYMBOL(mpu3050_dev_pm_ops);
> +EXPORT_RUNTIME_DEV_PM_OPS(mpu3050_dev_pm_ops,
> + mpu3050_runtime_suspend,
> + mpu3050_runtime_resume,
> + NULL);
>
> MODULE_AUTHOR("Linus Walleij");
> MODULE_DESCRIPTION("MPU3050 gyroscope driver");
> 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);
