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

2016-06-15 Thread Joerg Roedel
On Fri, Jun 03, 2016 at 03:21:30PM +0100, Russell King wrote:
> Convert DT component matching to use component_match_add_release().
> 
> Signed-off-by: Russell King 
> ---
>  drivers/iommu/mtk_iommu.c | 14 ++
>  1 file changed, 6 insertions(+), 8 deletions(-)

Applied, thanks.



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

2016-06-03 Thread Russell King
Convert DT component matching to use component_match_add_release().

Signed-off-by: Russell King 
---
 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 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -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 = >dev;

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

platform_set_drvdata(pdev, data);
-- 
2.1.0