On Sun, 30 Jan 2022 19:31:40 +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.
>
> This case uses the new DEFINE_RUNTIME_DEV_PM_OPS() to reduce
> boilerplate.
>
> Removing instances of this approach from IIO also stops them being
> copied into new drivers.
>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> drivers/iio/adc/ab8500-gpadc.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/iio/adc/ab8500-gpadc.c b/drivers/iio/adc/ab8500-gpadc.c
> index 4c46a201d4ef..78c2bd8bb91d 100644
> --- a/drivers/iio/adc/ab8500-gpadc.c
> +++ b/drivers/iio/adc/ab8500-gpadc.c
> @@ -942,7 +942,6 @@ static const struct iio_info ab8500_gpadc_info = {
> .read_raw = ab8500_gpadc_read_raw,
> };
>
> -#ifdef CONFIG_PM
> static int ab8500_gpadc_runtime_suspend(struct device *dev)
> {
> struct iio_dev *indio_dev = dev_get_drvdata(dev);
> @@ -965,7 +964,6 @@ static int ab8500_gpadc_runtime_resume(struct device *dev)
>
> return ret;
> }
> -#endif
>
> /**
> * ab8500_gpadc_parse_channel() - process devicetree channel configuration
> @@ -1199,20 +1197,15 @@ static int ab8500_gpadc_remove(struct platform_device *pdev)
> return 0;
> }
>
> -static const struct dev_pm_ops ab8500_gpadc_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> - pm_runtime_force_resume)
> - SET_RUNTIME_PM_OPS(ab8500_gpadc_runtime_suspend,
> - ab8500_gpadc_runtime_resume,
> - NULL)
> -};
> +static DEFINE_RUNTIME_DEV_PM_OPS(ab8500_gpadc_runtime_suspend,
0-day actually managed to build this driver unlike my test setups.
Anyhow, I managed to lose the name of the dev_pm_ops structure.
I've fixed that up and tested by hacking out the dependencies in Kconfig.
At somepoint I'll check if we can actually add a COMPILE_TEST option
for this one or if there are some actual requirements that my really
quick test didn't pick up on.
Fresh testing branch pushed out.
> + ab8500_gpadc_runtime_resume, NULL);
>
> static struct platform_driver ab8500_gpadc_driver = {
> .probe = ab8500_gpadc_probe,
> .remove = ab8500_gpadc_remove,
> .driver = {
> .name = "ab8500-gpadc",
> - .pm = &ab8500_gpadc_pm_ops,
> + .pm = pm_ptr(&ab8500_gpadc_pm_ops),
> },
> };
> builtin_platform_driver(ab8500_gpadc_driver);
