diff options
| author |  AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
| 2022-06-16 13:08:30 +0200 |
|---|---|---|
| committer |  Joerg Roedel <jroedel@suse.de>
| 2022-06-23 09:39:51 +0200 |
| commit | 21fd9be431adb880e55cf7b6b918e0696c0be643 (patch) | |
| tree | b96ffb066dab8a77de6658749c3ba9cb89cf8f5a /drivers/iommu/mtk_iommu.c | |
| parent | iommu/mediatek: Lookup phandle to retrieve syscon to infracfg (diff) | |
| download | linux-21fd9be431adb880e55cf7b6b918e0696c0be643.tar.gz linux-21fd9be431adb880e55cf7b6b918e0696c0be643.tar.bz2 linux-21fd9be431adb880e55cf7b6b918e0696c0be643.zip | |
iommu/mediatek: Cleanup pericfg lookup flow
Since only the INFRA type IOMMU needs to modify register(s) in the
pericfg iospace, it's safe to drop the pericfg_comp_str NULL check;
also, directly assign the regmap handle to data->pericfg instead of
to the infracfg variable to improve code readability.
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Link: https://lore.kernel.org/r/20220616110830.26037-6-angelogioacchino.delregno@collabora.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/mtk_iommu.c')
| -rw-r--r-- | drivers/iommu/mtk_iommu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 90685946fcbe..b2ae84046249 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -1217,15 +1217,13 @@ static int mtk_iommu_probe(struct platform_device *pdev) dev_err(dev, "mm dts parse fail(%d).", ret); goto out_runtime_disable; } - } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) && - data->plat_data->pericfg_comp_str) { - infracfg = syscon_regmap_lookup_by_compatible(data->plat_data->pericfg_comp_str); - if (IS_ERR(infracfg)) { - ret = PTR_ERR(infracfg); + } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA)) { + p = data->plat_data->pericfg_comp_str; + data->pericfg = syscon_regmap_lookup_by_compatible(p); + if (IS_ERR(data->pericfg)) { + ret = PTR_ERR(data->pericfg); goto out_runtime_disable; } - - data->pericfg = infracfg; } platform_set_drvdata(pdev, data); |