iommu: Convert to using %pOF instead of full_name

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: iommu@lists.linux-foundation.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index a34355fca37a555e5d5df308bd8df69f4a830b47..919ad9045ac41ee8be6d4002e1476d9d1b0d46ff 100644 (file)
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -530,8 +530,8 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)
                if (node) {
                        prop = of_get_property(node, "cache-stash-id", NULL);
                        if (!prop) {
-                               pr_debug("missing cache-stash-id at %s\n",
-                                        node->full_name);
+                               pr_debug("missing cache-stash-id at %pOF\n",
+                                        node);
                                of_node_put(node);
                                return ~(u32)0;
                        }
@@ -557,8 +557,8 @@ found_cpu_node:
                if (stash_dest_hint == cache_level) {
                        prop = of_get_property(node, "cache-stash-id", NULL);
                        if (!prop) {
-                               pr_debug("missing cache-stash-id at %s\n",
-                                        node->full_name);
+                               pr_debug("missing cache-stash-id at %pOF\n",
+                                        node);
                                of_node_put(node);
                                return ~(u32)0;
                        }
@@ -568,8 +568,7 @@ found_cpu_node:
 
                prop = of_get_property(node, "next-level-cache", NULL);
                if (!prop) {
-                       pr_debug("can't find next-level-cache at %s\n",
-                                node->full_name);
+                       pr_debug("can't find next-level-cache at %pOF\n", node);
                        of_node_put(node);
                        return ~(u32)0;  /* can't traverse any further */
                }
@@ -1063,8 +1062,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
 
        guts_node = of_find_matching_node(NULL, guts_device_ids);
        if (!guts_node) {
-               dev_err(dev, "could not find GUTS node %s\n",
-                       dev->of_node->full_name);
+               dev_err(dev, "could not find GUTS node %pOF\n", dev->of_node);
                ret = -ENODEV;
                goto error;
        }
@@ -1246,8 +1244,7 @@ static __init int fsl_pamu_init(void)
 
        pdev = platform_device_alloc("fsl-of-pamu", 0);
        if (!pdev) {
-               pr_err("could not allocate device %s\n",
-                      np->full_name);
+               pr_err("could not allocate device %pOF\n", np);
                ret = -ENOMEM;
                goto error_device_alloc;
        }
@@ -1259,8 +1256,7 @@ static __init int fsl_pamu_init(void)
 
        ret = platform_device_add(pdev);
        if (ret) {
-               pr_err("could not add device %s (err=%i)\n",
-                      np->full_name, ret);
+               pr_err("could not add device %pOF (err=%i)\n", np, ret);
                goto error_device_add;
        }
 

diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index da0e1e30ef378841601eab22e9e5a50c0049efc1..01c73479345d74fcfe54325d17b8949a5e04dd31 100644 (file)
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -619,8 +619,8 @@ static int handle_attach_device(struct fsl_dma_domain *dma_domain,
        for (i = 0; i < num; i++) {
                /* Ensure that LIODN value is valid */
                if (liodn[i] >= PAACE_NUMBER_ENTRIES) {
-                       pr_debug("Invalid liodn %d, attach device failed for %s\n",
-                                liodn[i], dev->of_node->full_name);
+                       pr_debug("Invalid liodn %d, attach device failed for %pOF\n",
+                                liodn[i], dev->of_node);
                        ret = -EINVAL;
                        break;
                }
@@ -684,8 +684,7 @@ static int fsl_pamu_attach_device(struct iommu_domain *domain,
                liodn_cnt = len / sizeof(u32);
                ret = handle_attach_device(dma_domain, dev, liodn, liodn_cnt);
        } else {
-               pr_debug("missing fsl,liodn property at %s\n",
-                        dev->of_node->full_name);
+               pr_debug("missing fsl,liodn property at %pOF\n", dev->of_node);
                ret = -EINVAL;
        }
 
@@ -720,8 +719,7 @@ static void fsl_pamu_detach_device(struct iommu_domain *domain,
        if (prop)
                detach_device(dev, dma_domain);
        else
-               pr_debug("missing fsl,liodn property at %s\n",
-                        dev->of_node->full_name);
+               pr_debug("missing fsl,liodn property at %pOF\n", dev->of_node);
 }
 
 static  int configure_domain_geometry(struct iommu_domain *domain, void *data)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index be8ac1ddec0656494fb2e5f9aa25bed67ce32f7b..34160e7a8dd7d2e233efc5053912299876fe1b7f 100644 (file)
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -245,8 +245,7 @@ static int __init of_iommu_init(void)
                const of_iommu_init_fn init_fn = match->data;
 
                if (init_fn && init_fn(np))
-                       pr_err("Failed to initialise IOMMU %s\n",
-                               of_node_full_name(np));
+                       pr_err("Failed to initialise IOMMU %pOF\n", np);
        }
 
        return 0;

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 4ba48a26b389406af5a0d6636ecb7d1fa4e03346..1b8155dada26f1a5dcd9a70a21d88237742edb12 100644 (file)
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1008,20 +1008,20 @@ static int rk_iommu_group_set_iommudata(struct iommu_group *group,
        ret = of_parse_phandle_with_args(np, "iommus", "#iommu-cells", 0,
                                         &args);
        if (ret) {
-               dev_err(dev, "of_parse_phandle_with_args(%s) => %d\n",
-                       np->full_name, ret);
+               dev_err(dev, "of_parse_phandle_with_args(%pOF) => %d\n",
+                       np, ret);
                return ret;
        }
        if (args.args_count != 0) {
-               dev_err(dev, "incorrect number of iommu params found for %s (found %d, expected 0)\n",
-                       args.np->full_name, args.args_count);
+               dev_err(dev, "incorrect number of iommu params found for %pOF (found %d, expected 0)\n",
+                       args.np, args.args_count);
                return -EINVAL;
        }
 
        pd = of_find_device_by_node(args.np);
        of_node_put(args.np);
        if (!pd) {
-               dev_err(dev, "iommu %s not found\n", args.np->full_name);
+               dev_err(dev, "iommu %pOF not found\n", args.np);
                return -EPROBE_DEFER;
        }