Am Dienstag, dem 29.11.2022 um 19:17 +0000 schrieb Paul Cercueil:
> Use the RUNTIME_PM_OPS() and pm_ptr() macros to handle the
> .runtime_suspend/.runtime_resume callbacks.
>
> These macros allow the suspend and resume functions to be automatically
> dropped by the compiler when CONFIG_PM is disabled, without having
> to use #ifdef guards.
>
> This has the advantage of always compiling these functions in,
> independently of any Kconfig option. Thanks to that, bugs and other
> regressions are subsequently easier to catch.
>
> Some #ifdef CONFIG_PM guards were protecting simple statements, and were
> also converted to "if (IS_ENABLED(CONFIG_PM))".
>
> Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Thanks, applied to my etnaviv/next branch.
Regards,
Lucas
> ---
> Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> Cc: Russell King <linux+etnaviv@xxxxxxxxxxxxxxx>
> Cc: Christian Gmeiner <christian.gmeiner@xxxxxxxxx>
> Cc: etnaviv@xxxxxxxxxxxxxxxxxxxxx
> ---
> drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 +++++++++++----------------
> 1 file changed, 12 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> index 51320eeebfcf..310382812029 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> @@ -1629,7 +1629,6 @@ static int etnaviv_gpu_hw_suspend(struct etnaviv_gpu *gpu)
> return etnaviv_gpu_clk_disable(gpu);
> }
>
> -#ifdef CONFIG_PM
> static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu)
> {
> int ret;
> @@ -1645,7 +1644,6 @@ static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu)
>
> return 0;
> }
> -#endif
>
> static int
> etnaviv_gpu_cooling_get_max_state(struct thermal_cooling_device *cdev,
> @@ -1713,11 +1711,10 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master,
> if (ret)
> goto out_workqueue;
>
> -#ifdef CONFIG_PM
> - ret = pm_runtime_get_sync(gpu->dev);
> -#else
> - ret = etnaviv_gpu_clk_enable(gpu);
> -#endif
> + if (IS_ENABLED(CONFIG_PM))
> + ret = pm_runtime_get_sync(gpu->dev);
> + else
> + ret = etnaviv_gpu_clk_enable(gpu);
> if (ret < 0)
> goto out_sched;
>
> @@ -1761,12 +1758,12 @@ static void etnaviv_gpu_unbind(struct device *dev, struct device *master,
>
> etnaviv_sched_fini(gpu);
>
> -#ifdef CONFIG_PM
> - pm_runtime_get_sync(gpu->dev);
> - pm_runtime_put_sync_suspend(gpu->dev);
> -#else
> - etnaviv_gpu_hw_suspend(gpu);
> -#endif
> + if (IS_ENABLED(CONFIG_PM)) {
> + pm_runtime_get_sync(gpu->dev);
> + pm_runtime_put_sync_suspend(gpu->dev);
> + } else {
> + etnaviv_gpu_hw_suspend(gpu);
> + }
>
> if (gpu->mmu_context)
> etnaviv_iommu_context_put(gpu->mmu_context);
> @@ -1880,7 +1877,6 @@ static int etnaviv_gpu_platform_remove(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM
> static int etnaviv_gpu_rpm_suspend(struct device *dev)
> {
> struct etnaviv_gpu *gpu = dev_get_drvdata(dev);
> @@ -1923,18 +1919,16 @@ static int etnaviv_gpu_rpm_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> static const struct dev_pm_ops etnaviv_gpu_pm_ops = {
> - SET_RUNTIME_PM_OPS(etnaviv_gpu_rpm_suspend, etnaviv_gpu_rpm_resume,
> - NULL)
> + RUNTIME_PM_OPS(etnaviv_gpu_rpm_suspend, etnaviv_gpu_rpm_resume, NULL)
> };
>
> struct platform_driver etnaviv_gpu_driver = {
> .driver = {
> .name = "etnaviv-gpu",
> .owner = THIS_MODULE,
> - .pm = &etnaviv_gpu_pm_ops,
> + .pm = pm_ptr(&etnaviv_gpu_pm_ops),
> .of_match_table = etnaviv_gpu_match,
> },
> .probe = etnaviv_gpu_platform_probe,
