Commit b5765a1b authored by Yong Wu's avatar Yong Wu Committed by Joerg Roedel
Browse files

iommu/mediatek: Use component_match_add 



In order to simplify the error patch(avoid call of_node_put), Use
component_match_add instead component_match_add_release since we are only
interested in the "device" here. Then we could always call of_node_put in
normal path.

Strictly this is not a fixes patch, but it is a prepare for adding the
error path, thus I add a Fixes tag too.

Fixes: d2e9a110 ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Suggested-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Link: https://lore.kernel.org/r/20221018024258.19073-3-yong.wu@mediatek.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent dcb40e9f

drivers/iommu/mtk_iommu.c

+4 −6
Original line number Diff line number Diff line
@@ -1080,19 +1080,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m 
			id = i;



		plarbdev = of_find_device_by_node(larbnode);

		if (!plarbdev) {

		of_node_put(larbnode);

		if (!plarbdev)

			return -ENODEV;

		}



		if (!plarbdev->dev.driver) {

			of_node_put(larbnode);

			platform_device_put(plarbdev);

			return -EPROBE_DEFER;

		}

		data->larb_imu[id].dev = &plarbdev->dev;



		component_match_add_release(dev, match, component_release_of,

					    component_compare_of, larbnode);

		component_match_add(dev, match, component_compare_dev, &plarbdev->dev);

		platform_device_put(plarbdev);

	}