tty: 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>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-serial@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 61fe8d6fd24e1bb0cf2cdfd2a4de67ceb05123bf..a1c7125cb968fdcbe9f69a5c29b306adff000b66 100644 (file)
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -122,7 +122,7 @@ static int find_console_handle(void)
 
        stdout_irq = irq_of_parse_and_map(np, 0);
        if (stdout_irq == NO_IRQ) {
-               pr_err("ehv-bc: no 'interrupts' property in %s node\n", np->full_name);
+               pr_err("ehv-bc: no 'interrupts' property in %pOF node\n", np);
                return 0;
        }
 

diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 51079931109956178a0730716307c7c773f7c643..16331a90c1e89f3430e6c5e5909a05e7e8914aed 100644 (file)
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -179,8 +179,8 @@ static int hvc_opal_probe(struct platform_device *dev)
                proto = HV_PROTOCOL_HVSI;
                ops = &hvc_opal_hvsi_ops;
        } else {
-               pr_err("hvc_opal: Unknown protocol for %s\n",
-                      dev->dev.of_node->full_name);
+               pr_err("hvc_opal: Unknown protocol for %pOF\n",
+                      dev->dev.of_node);
                return -ENXIO;
        }
 
@@ -204,14 +204,14 @@ static int hvc_opal_probe(struct platform_device *dev)
                /* Instanciate now to establish a mapping index==vtermno */
                hvc_instantiate(termno, termno, ops);
        } else {
-               pr_err("hvc_opal: Device %s has duplicate terminal number #%d\n",
-                      dev->dev.of_node->full_name, termno);
+               pr_err("hvc_opal: Device %pOF has duplicate terminal number #%d\n",
+                      dev->dev.of_node, termno);
                return -ENXIO;
        }
 
-       pr_info("hvc%d: %s protocol on %s%s\n", termno,
+       pr_info("hvc%d: %s protocol on %pOF%s\n", termno,
                proto == HV_PROTOCOL_RAW ? "raw" : "hvsi",
-               dev->dev.of_node->full_name,
+               dev->dev.of_node,
                boot ? " (boot console)" : "");
 
        irq = irq_of_parse_and_map(dev->dev.of_node, 0);
@@ -222,8 +222,8 @@ static int hvc_opal_probe(struct platform_device *dev)
        }
 
        if (!irq) {
-               pr_err("hvc_opal: Unable to map interrupt for device %s\n",
-                       dev->dev.of_node->full_name);
+               pr_err("hvc_opal: Unable to map interrupt for device %pOF\n",
+                       dev->dev.of_node);
                return irq;
        }
 

diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index b05dc508662795639d391aee29ed568c2e2fe75e..78b003be7f670a1ba4d6e61142677fe594a6a345 100644 (file)
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -312,12 +312,12 @@ static int hvc_vio_probe(struct vio_dev *vdev,
                proto = HV_PROTOCOL_HVSI;
                ops = &hvterm_hvsi_ops;
        } else {
-               pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name);
+               pr_err("hvc_vio: Unknown protocol for %pOF\n", vdev->dev.of_node);
                return -ENXIO;
        }
 
-       pr_devel("hvc_vio_probe() device %s, using %s protocol\n",
-                vdev->dev.of_node->full_name,
+       pr_devel("hvc_vio_probe() device %pOF, using %s protocol\n",
+                vdev->dev.of_node,
                 proto == HV_PROTOCOL_RAW ? "raw" : "hvsi");
 
        /* Is it our boot one ? */

diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index ae1aaa0075d1c1b87cc339014ef3b61c34c4fb1e..c68fb3a8ea1c3ca0d26d275b877940714968a7e7 100644 (file)
--- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c
@@ -363,7 +363,7 @@ static int of_serdev_register_devices(struct serdev_controller *ctrl)
                if (!of_get_property(node, "compatible", NULL))
                        continue;
 
-               dev_dbg(&ctrl->dev, "adding child %s\n", node->full_name);
+               dev_dbg(&ctrl->dev, "adding child %pOF\n", node);
 
                serdev = serdev_device_alloc(ctrl);
                if (!serdev)

diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 3970d6a9aaca42e4dd459bd483b06599f77884fd..4cacaadbd14bea112219dd0720baad568b61de9c 100644 (file)
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -1634,8 +1634,8 @@ mpc52xx_console_setup(struct console *co, char *options)
                return -EINVAL;
        }
 
-       pr_debug("Console on ttyPSC%x is %s\n",
-                co->index, mpc52xx_uart_nodes[co->index]->full_name);
+       pr_debug("Console on ttyPSC%x is %pOF\n",
+                co->index, mpc52xx_uart_nodes[co->index]);
 
        /* Fetch register locations */
        ret = of_address_to_resource(np, 0, &res);
@@ -1755,8 +1755,8 @@ static int mpc52xx_uart_of_probe(struct platform_device *op)
                        break;
        if (idx >= MPC52xx_PSC_MAXNUM)
                return -EINVAL;
-       pr_debug("Found %s assigned to ttyPSC%x\n",
-                mpc52xx_uart_nodes[idx]->full_name, idx);
+       pr_debug("Found %pOF assigned to ttyPSC%x\n",
+                mpc52xx_uart_nodes[idx], idx);
 
        /* set the uart clock to the input clock of the psc, the different
         * prescalers are taken into account in the set_baudrate() methods
@@ -1881,8 +1881,8 @@ mpc52xx_uart_of_enumerate(void)
 
        for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) {
                if (mpc52xx_uart_nodes[i])
-                       pr_debug("%s assigned to ttyPSC%x\n",
-                                mpc52xx_uart_nodes[i]->full_name, i);
+                       pr_debug("%pOF assigned to ttyPSC%x\n",
+                                mpc52xx_uart_nodes[i], i);
        }
 }
 

diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 0da52947e59e0f7deec59244ad31f473be36349a..6ccdd018fb453c287a20de5f9469aa484dde21ba 100644 (file)
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1671,8 +1671,8 @@ static int __init pmz_probe(void)
                if (!node_a && !node_b) {
                        of_node_put(node_a);
                        of_node_put(node_b);
-                       printk(KERN_ERR "pmac_zilog: missing node %c for escc %s\n",
-                               (!node_a) ? 'a' : 'b', node_p->full_name);
+                       printk(KERN_ERR "pmac_zilog: missing node %c for escc %pOF\n",
+                               (!node_a) ? 'a' : 'b', node_p);
                        continue;
                }
 

diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 72df2e1b88afe209c8e9420a28f46eeb865b987a..5380407bb0bef0ec52c6d180a5bf0a276351e4de 100644 (file)
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1212,8 +1212,8 @@ static int sunsu_kbd_ms_init(struct uart_sunsu_port *up)
        if (up->port.type == PORT_UNKNOWN)
                return -ENODEV;
 
-       printk("%s: %s port at %llx, irq %u\n",
-              up->port.dev->of_node->full_name,
+       printk("%pOF: %s port at %llx, irq %u\n",
+              up->port.dev->of_node,
               (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
               (unsigned long long) up->port.mapbase,
               up->port.irq);