From 1e93157ca8569d5b233764ac54e4675ec637f679 Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Thu, 1 Oct 2026 19:34:51 +0200 Subject: [PATCH] media: rkvdec: Switch to modern PM_OPS A new set of modern PM_OPS macros got defined in commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old ones") Switch to those new macros so that the PM callbacks are always seen by the compiler, but discarded if not used. This lets us drop the check for CONFIG_PM. Signed-off-by: Diederik de Haas Reviewed-by: Nicolas Dufresne Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil --- drivers/media/platform/rockchip/rkvdec/rkvdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c index f43754ae857d..fbcd0f175ad3 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -1872,7 +1872,6 @@ static void rkvdec_remove(struct platform_device *pdev) iommu_domain_free(rkvdec->empty_domain); } -#ifdef CONFIG_PM static int rkvdec_runtime_resume(struct device *dev) { struct rkvdec_dev *rkvdec = dev_get_drvdata(dev); @@ -1887,12 +1886,10 @@ static int rkvdec_runtime_suspend(struct device *dev) clk_bulk_disable_unprepare(rkvdec->num_clocks, rkvdec->clocks); return 0; } -#endif static const struct dev_pm_ops rkvdec_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) - SET_RUNTIME_PM_OPS(rkvdec_runtime_suspend, rkvdec_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) + RUNTIME_PM_OPS(rkvdec_runtime_suspend, rkvdec_runtime_resume, NULL) }; static struct platform_driver rkvdec_driver = { @@ -1901,7 +1898,7 @@ static struct platform_driver rkvdec_driver = { .driver = { .name = "rkvdec", .of_match_table = of_rkvdec_match, - .pm = &rkvdec_pm_ops, + .pm = pm_ptr(&rkvdec_pm_ops), }, }; module_platform_driver(rkvdec_driver);