[PATCH v2 3/3] iommu: convert DT component matching to component_match_add_release()

[Russell King]

Convert DT component matching to use component_match_add_release().

Signed-off-by: Russell King <rmk+kernel at armlinux.org.uk>
---
 drivers/iommu/mtk_iommu.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index c3043d8754e3..71cf62af4e24 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -24,6 +24,7 @@
 #include <linux/iopoll.h>
 #include <linux/list.h>
 #include <linux/of_address.h>
+#include <linux/of_component.h>
 #include <linux/of_iommu.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
@@ -552,11 +553,6 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data 
*data)
        return 0;
 }

-static int compare_of(struct device *dev, void *data)
-{
-       return dev->of_node == data;
-}
-
 static int mtk_iommu_bind(struct device *dev)
 {
        struct mtk_iommu_data *data = dev_get_drvdata(dev);
@@ -630,17 +626,19 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                        continue;

                plarbdev = of_find_device_by_node(larbnode);
-               of_node_put(larbnode);
                if (!plarbdev) {
                        plarbdev = of_platform_device_create(
                                                larbnode, NULL,
                                                platform_bus_type.dev_root);
-                       if (!plarbdev)
+                       if (!plarbdev) {
+                               of_node_put(larbnode);
                                return -EPROBE_DEFER;
+                       }
                }
                data->smi_imu.larb_imu[i].dev = &plarbdev->dev;

-               component_match_add(dev, &match, compare_of, larbnode);
+               component_match_add_of(dev, &match, larbnode);
+               of_node_put(larbnode);
        }

        platform_set_drvdata(pdev, data);
-- 
2.1.0