From d22aff3bfad0c51a351e9a5a2c13d4e170e97b4d Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Thu, 15 Dec 2022 15:21:41 +0800 Subject: [PATCH] media: rockchip: remove cif/isp/ispp hw SYSTEM_SLEEP_PM_OPS fix suspend error by vir dev and hw dev run SYSTEM_SLEEP_PM_OPS Change-Id: I10971c3f43debf082278cf13aacf68eb97d2f0c3 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/cif/hw.c | 2 -- drivers/media/platform/rockchip/isp/hw.c | 2 -- drivers/media/platform/rockchip/ispp/hw.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c index 612fcb22d76c..44156003b9d7 100644 --- a/drivers/media/platform/rockchip/cif/hw.c +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -1367,8 +1367,6 @@ static int __maybe_unused rkcif_runtime_resume(struct device *dev) } static const struct dev_pm_ops rkcif_plat_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) SET_RUNTIME_PM_OPS(rkcif_runtime_suspend, rkcif_runtime_resume, NULL) }; diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c index ee55ec87f7cd..98ebb9d8f8dc 100644 --- a/drivers/media/platform/rockchip/isp/hw.c +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -1063,8 +1063,6 @@ static int __maybe_unused rkisp_runtime_resume(struct device *dev) } static const struct dev_pm_ops rkisp_hw_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) SET_RUNTIME_PM_OPS(rkisp_runtime_suspend, rkisp_runtime_resume, NULL) }; diff --git a/drivers/media/platform/rockchip/ispp/hw.c b/drivers/media/platform/rockchip/ispp/hw.c index d1a5a01323d5..e1ab9f19485f 100644 --- a/drivers/media/platform/rockchip/ispp/hw.c +++ b/drivers/media/platform/rockchip/ispp/hw.c @@ -472,8 +472,6 @@ static int __maybe_unused rkispp_runtime_resume(struct device *dev) } static const struct dev_pm_ops rkispp_hw_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) SET_RUNTIME_PM_OPS(rkispp_runtime_suspend, rkispp_runtime_resume, NULL) };