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);