Patch "iommu/mediatek: Use component_match_add" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    iommu/mediatek: Use component_match_add

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     iommu-mediatek-use-component_match_add.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 24d0573601995905e332b77262f4057861154e4f
Author: Yong Wu <yong.wu@xxxxxxxxxxxx>
Date:   Tue Oct 18 10:42:54 2022 +0800

    iommu/mediatek: Use component_match_add
    
    [ Upstream commit b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 ]
    
    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: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
    Suggested-by: Robin Murphy <robin.murphy@xxxxxxx>
    Signed-off-by: Yong Wu <yong.wu@xxxxxxxxxxxx>
    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
    Reviewed-by: Matthias Brugger <matthias.bgg@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20221018024258.19073-3-yong.wu@xxxxxxxxxxxx
    Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 93005e63fc7f..ce9288695f9b 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1066,19 +1066,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);
+		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);
 	}