Commit 6b05266a authored by Paul Cercueil's avatar Paul Cercueil Committed by Lucas Stach
Browse files

drm/etnaviv: Remove #ifdef guards for PM related functions 



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: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent 764be123

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+12 −18
Original line number Diff line number Diff line
@@ -1649,7 +1649,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;
@@ -1665,7 +1664,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,
@@ -1733,11 +1731,10 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master, 
	if (ret)

		goto out_workqueue;



#ifdef CONFIG_PM

	if (IS_ENABLED(CONFIG_PM))

		ret = pm_runtime_get_sync(gpu->dev);

#else

	else

		ret = etnaviv_gpu_clk_enable(gpu);

#endif

	if (ret < 0)

		goto out_sched;
@@ -1781,12 +1778,12 @@ static void etnaviv_gpu_unbind(struct device *dev, struct device *master, 


	etnaviv_sched_fini(gpu);



#ifdef CONFIG_PM

	if (IS_ENABLED(CONFIG_PM)) {

		pm_runtime_get_sync(gpu->dev);

		pm_runtime_put_sync_suspend(gpu->dev);

#else

	} else {

		etnaviv_gpu_hw_suspend(gpu);

#endif

	}



	if (gpu->mmu_context)

		etnaviv_iommu_context_put(gpu->mmu_context);
@@ -1900,7 +1897,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);
@@ -1943,18 +1939,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,