Unverified Commit 1d9e6664 authored by Paul Cercueil's avatar Paul Cercueil
Browse files

drm: exynos: Remove #ifdef guards for PM related functions 



Use the DEFINE_RUNTIME_DEV_PM_OPS(), SYSTEM_SLEEP_PM_OPS(),
RUNTIME_PM_OPS() and pm_ptr() macros to handle the runtime and suspend
PM 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.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Acked-by: default avatarInki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221129191733.137897-10-paul@crapouillou.net
parent 196c9226

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+4 −9
Original line number Diff line number Diff line
@@ -710,7 +710,6 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



#ifdef CONFIG_PM

static int exynos5433_decon_suspend(struct device *dev)

{

	struct decon_context *ctx = dev_get_drvdata(dev);
@@ -741,14 +740,10 @@ static int exynos5433_decon_resume(struct device *dev) 


	return ret;

}

#endif



static const struct dev_pm_ops exynos5433_decon_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos5433_decon_suspend, exynos5433_decon_resume,

			   NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				     pm_runtime_force_resume)

};

static DEFINE_RUNTIME_DEV_PM_OPS(exynos5433_decon_pm_ops,

				 exynos5433_decon_suspend,

				 exynos5433_decon_resume, NULL);



static const struct of_device_id exynos5433_decon_driver_dt_match[] = {

	{
@@ -881,7 +876,7 @@ struct platform_driver exynos5433_decon_driver = { 
	.remove		= exynos5433_decon_remove,

	.driver		= {

		.name	= "exynos5433-decon",

		.pm	= &exynos5433_decon_pm_ops,

		.pm	= pm_ptr(&exynos5433_decon_pm_ops),

		.of_match_table = exynos5433_decon_driver_dt_match,

	},

};

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+3 −9
Original line number Diff line number Diff line
@@ -779,7 +779,6 @@ static int decon_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int exynos7_decon_suspend(struct device *dev)

{

	struct decon_context *ctx = dev_get_drvdata(dev);
@@ -836,21 +835,16 @@ static int exynos7_decon_resume(struct device *dev) 
err_pclk_enable:

	return ret;

}

#endif



static const struct dev_pm_ops exynos7_decon_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos7_decon_suspend, exynos7_decon_resume,

			   NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

};

static DEFINE_RUNTIME_DEV_PM_OPS(exynos7_decon_pm_ops, exynos7_decon_suspend,

				 exynos7_decon_resume, NULL);



struct platform_driver decon_driver = {

	.probe		= decon_probe,

	.remove		= decon_remove,

	.driver		= {

		.name	= "exynos-decon",

		.pm	= &exynos7_decon_pm_ops,

		.pm	= pm_ptr(&exynos7_decon_pm_ops),

		.of_match_table = decon_driver_dt_match,

	},

};

drivers/gpu/drm/exynos/exynos_dp.c

+3 −8
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static int exynos_dp_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int exynos_dp_suspend(struct device *dev)

{

	struct exynos_dp_device *dp = dev_get_drvdata(dev);
@@ -274,13 +273,9 @@ static int exynos_dp_resume(struct device *dev) 


	return analogix_dp_resume(dp->adp);

}

#endif



static const struct dev_pm_ops exynos_dp_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos_dp_suspend, exynos_dp_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

};

static DEFINE_RUNTIME_DEV_PM_OPS(exynos_dp_pm_ops, exynos_dp_suspend,

				 exynos_dp_resume, NULL);



static const struct of_device_id exynos_dp_match[] = {

	{ .compatible = "samsung,exynos5-dp" },
@@ -294,7 +289,7 @@ struct platform_driver dp_driver = { 
	.driver		= {

		.name	= "exynos-dp",

		.owner	= THIS_MODULE,

		.pm	= &exynos_dp_pm_ops,

		.pm	= pm_ptr(&exynos_dp_pm_ops),

		.of_match_table = exynos_dp_match,

	},

};

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+3 −8
Original line number Diff line number Diff line
@@ -1381,7 +1381,6 @@ static int fimc_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int fimc_runtime_suspend(struct device *dev)

{

	struct fimc_context *ctx = get_fimc_context(dev);
@@ -1398,13 +1397,9 @@ static int fimc_runtime_resume(struct device *dev) 
	DRM_DEV_DEBUG_KMS(dev, "id[%d]\n", ctx->id);

	return clk_prepare_enable(ctx->clocks[FIMC_CLK_GATE]);

}

#endif



static const struct dev_pm_ops fimc_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(fimc_runtime_suspend, fimc_runtime_resume, NULL)

};

static DEFINE_RUNTIME_DEV_PM_OPS(fimc_pm_ops, fimc_runtime_suspend,

				 fimc_runtime_resume, NULL);



static const struct of_device_id fimc_of_match[] = {

	{ .compatible = "samsung,exynos4210-fimc" },
@@ -1420,6 +1415,6 @@ struct platform_driver fimc_driver = { 
		.of_match_table = fimc_of_match,

		.name	= "exynos-drm-fimc",

		.owner	= THIS_MODULE,

		.pm	= &fimc_pm_ops,

		.pm	= pm_ptr(&fimc_pm_ops),

	},

};

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+3 −8
Original line number Diff line number Diff line
@@ -1287,7 +1287,6 @@ static int fimd_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int exynos_fimd_suspend(struct device *dev)

{

	struct fimd_context *ctx = dev_get_drvdata(dev);
@@ -1321,13 +1320,9 @@ static int exynos_fimd_resume(struct device *dev) 


	return 0;

}

#endif



static const struct dev_pm_ops exynos_fimd_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos_fimd_suspend, exynos_fimd_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

};

static DEFINE_RUNTIME_DEV_PM_OPS(exynos_fimd_pm_ops, exynos_fimd_suspend,

				 exynos_fimd_resume, NULL);



struct platform_driver fimd_driver = {

	.probe		= fimd_probe,
@@ -1335,7 +1330,7 @@ struct platform_driver fimd_driver = { 
	.driver		= {

		.name	= "exynos4-fb",

		.owner	= THIS_MODULE,

		.pm	= &exynos_fimd_pm_ops,

		.pm	= pm_ptr(&exynos_fimd_pm_ops),

		.of_match_table = fimd_driver_dt_match,

	},

};