forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: iommu/mediatek: Remove unnecessary check in attach_device

Browse source 
This priv_data is set in the of_xlate. if of_xlate failed, it should
not enter attach_device. remove the unnecessary check.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20210111111914.22211-32-yong.wu@mediatek.com
Signed-off-by: Will Deacon <will@kernel.org>
(cherry picked from commit 23357572be)

BUG=b:174513569

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Change-Id: Icd2d561abd0dcf1c580c2cbca89df4bc06b8299f
This commit is contained in:
Yong Wu 2021-01-11 19:19:12 +08:00 • committed by Todd Kjos
commit b28fe378d1
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/iommu/mtk_iommu.c
View file

@ -453,9 +453,6 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
struct device *m4udev = data->dev;
int ret, domid;
if (!data)
return -ENODEV;
domid = mtk_iommu_get_domain_id(dev, data->plat_data);
if (domid < 0)
return domid;
@ -492,9 +489,6 @@ static void mtk_iommu_detach_device(struct iommu_domain *domain,
{
struct mtk_iommu_data *data = dev_iommu_priv_get(dev);
if (!data)
return;
mtk_iommu_config(data, dev, false, 0);
}