From 2dd7f5f53f7a02aa6e28afaa92c417e4cdd515d7 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Fri, 1 Oct 2021 22:55:07 +0800 Subject: [PATCH] media: rockchip: cif fix issue for CONFIG_ROCKCHIP_IOMMU=n Signed-off-by: Zefa Chen Change-Id: I6914ac32bcef7c56eabe6bef9b9acce68615cbc7 --- drivers/media/platform/rockchip/cif/capture.c | 4 ++-- drivers/media/platform/rockchip/cif/hw.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index ae6deb00fa0d..d868d9c32f1e 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -2356,8 +2356,8 @@ static void rkcif_do_cru_reset(struct rkcif_device *dev) domain = iommu_get_domain_for_dev(cif_hw->dev); if (domain) { - domain->ops->detach_dev(domain, cif_hw->dev); - domain->ops->attach_dev(domain, cif_hw->dev); + iommu_detach_device(domain, cif_hw->dev); + iommu_attach_device(domain, cif_hw->dev); } } } diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c index 1dc663366227..da3032c68c13 100644 --- a/drivers/media/platform/rockchip/cif/hw.c +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -765,7 +765,7 @@ err: static void rkcif_iommu_cleanup(struct rkcif_hw *cif_hw) { if (cif_hw->domain) - cif_hw->domain->ops->detach_dev(cif_hw->domain, cif_hw->dev); + iommu_detach_device(cif_hw->domain, cif_hw->dev); } static void rkcif_iommu_enable(struct rkcif_hw *cif_hw) @@ -774,7 +774,7 @@ static void rkcif_iommu_enable(struct rkcif_hw *cif_hw) cif_hw->domain = iommu_get_domain_for_dev(cif_hw->dev); if (cif_hw->domain) - cif_hw->domain->ops->attach_dev(cif_hw->domain, cif_hw->dev); + iommu_attach_device(cif_hw->domain, cif_hw->dev); } static inline bool is_iommu_enable(struct device *dev)