ENGR00313685-5 of: Add helper for printing an of_phandle_args structure

commit 624cfca534f9b1ffb1326617b4e973a3d5ecff4a upstream.

It is sometimes useful for debug to get the contents of an
of_phandle_args structure out into the kernel log.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

Conflicts:
	drivers/of/base.c

3 files changed, 13 insertions, 3 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index fad95c811bec..c258df42b002 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1081,6 +1081,15 @@ int of_property_count_strings(struct device_node *np, const char *propname)
 }
 EXPORT_SYMBOL_GPL(of_property_count_strings);
 
+void of_print_phandle_args(const char *msg, const struct of_phandle_args *args)
+{
+        int i;
+        printk("%s %s", msg, of_node_full_name(args->np));
+        for (i = 0; i < args->args_count; i++)
+                printk(i ? ",%08x" : ":%08x", args->args[i]);
+        printk("\n");
+}
+
 /**
  * of_parse_phandle - Resolve a phandle property to a device_node pointer
  * @np: Pointer to device node holding phandle property
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 5dc08c865122..1f4ffeb4aaec 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -101,9 +101,9 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
         u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;
         int imaplen, match, i;
 
-        pr_debug("of_irq_parse_raw: par=%s,intspec=[0x%08x 0x%08x...],ointsize=%d\n",
-                 of_node_full_name(out_irq->np), out_irq->args[0], out_irq->args[1],
-                 out_irq->args_count);
+#ifdef DEBUG
+        of_print_phandle_args("of_irq_parse_raw: ", out_irq);
+#endif
 
         ipar = of_node_get(out_irq->np);
 
diff --git a/include/linux/of.h b/include/linux/of.h
index 429e16801858..668e12322dd4 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -274,6 +274,7 @@ extern int of_n_size_cells(struct device_node *np);
 extern const struct of_device_id *of_match_node(
         const struct of_device_id *matches, const struct device_node *node);
 extern int of_modalias_node(struct device_node *node, char *modalias, int len);
+extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args);
 extern struct device_node *of_parse_phandle(const struct device_node *np,
                                             const char *phandle_name,
                                             int index);