| Message ID | 20211123211019.2271440-15-jic23@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | iio: Tree wide switch from CONFIG_PM* to __maybe_unused etc. | expand |
On 23/11/2021 22:09, Jonathan Cameron wrote: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Letting the compiler remove these functions when the kernel is built > without CONFIG_PM_SLEEP 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. > > The pm_ptr() macro only removes the reference if CONFIG_PM is not > set. It is possible for CONFIG_PM=y without CONFIG_SLEEP, so this > will not always remove the pm_ops structure. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Krzysztof Kozlowski <krzk@kernel.org> > --- > drivers/iio/adc/exynos_adc.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > Looks good: Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c index 3b3868aa2533..01a801d325a9 100644 --- a/drivers/iio/adc/exynos_adc.c +++ b/drivers/iio/adc/exynos_adc.c @@ -968,8 +968,7 @@ static int exynos_adc_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int exynos_adc_suspend(struct device *dev) +static __maybe_unused int exynos_adc_suspend(struct device *dev) { struct iio_dev *indio_dev = dev_get_drvdata(dev); struct exynos_adc *info = iio_priv(indio_dev); @@ -982,7 +981,7 @@ static int exynos_adc_suspend(struct device *dev) return 0; } -static int exynos_adc_resume(struct device *dev) +static __maybe_unused int exynos_adc_resume(struct device *dev) { struct iio_dev *indio_dev = dev_get_drvdata(dev); struct exynos_adc *info = iio_priv(indio_dev); @@ -1001,7 +1000,6 @@ static int exynos_adc_resume(struct device *dev) return 0; } -#endif static SIMPLE_DEV_PM_OPS(exynos_adc_pm_ops, exynos_adc_suspend, @@ -1013,7 +1011,7 @@ static struct platform_driver exynos_adc_driver = { .driver = { .name = "exynos-adc", .of_match_table = exynos_adc_match, - .pm = &exynos_adc_pm_ops, + .pm = pm_ptr(&exynos_adc_pm_ops), }, };