From 089ceee21e26a655172478ee6b083aa776006b44 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Mon, 4 Dec 2023 11:11:35 +0800 Subject: [PATCH] media: rockchip: vicap change stream suspend/resume early Signed-off-by: Zefa Chen Change-Id: I80eb4105d640b334126c74c48ad4edaf4cb40fb1 --- drivers/media/platform/rockchip/cif/dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c index 9141b2a578d0..a1ec70a5f3a1 100644 --- a/drivers/media/platform/rockchip/cif/dev.c +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -2240,7 +2240,7 @@ static int rkcif_plat_remove(struct platform_device *pdev) return 0; } -static int __maybe_unused rkcif_runtime_prepare(struct device *dev) +static int __maybe_unused rkcif_sleep_suspend(struct device *dev) { struct rkcif_device *cif_dev = dev_get_drvdata(dev); @@ -2248,11 +2248,12 @@ static int __maybe_unused rkcif_runtime_prepare(struct device *dev) return 0; } -static void __maybe_unused rkcif_runtime_complete(struct device *dev) +static int __maybe_unused rkcif_sleep_resume(struct device *dev) { struct rkcif_device *cif_dev = dev_get_drvdata(dev); rkcif_stream_resume(cif_dev, RKCIF_RESUME_CIF); + return 0; } static int __maybe_unused rkcif_runtime_suspend(struct device *dev) @@ -2325,8 +2326,7 @@ late_initcall(rkcif_clr_unready_dev); #endif static const struct dev_pm_ops rkcif_plat_pm_ops = { - .prepare = rkcif_runtime_prepare, - .complete = rkcif_runtime_complete, + SET_SYSTEM_SLEEP_PM_OPS(rkcif_sleep_suspend, rkcif_sleep_resume) SET_RUNTIME_PM_OPS(rkcif_runtime_suspend, rkcif_runtime_resume, NULL) };