Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rob Herring and committed by
Greg Kroah-Hartman
a73ee843 46d01710

+23 -23
+1 -1
drivers/tty/ehv_bytechan.c
··· 122 122 123 123 stdout_irq = irq_of_parse_and_map(np, 0); 124 124 if (stdout_irq == NO_IRQ) { 125 - pr_err("ehv-bc: no 'interrupts' property in %s node\n", np->full_name); 125 + pr_err("ehv-bc: no 'interrupts' property in %pOF node\n", np); 126 126 return 0; 127 127 } 128 128
+8 -8
drivers/tty/hvc/hvc_opal.c
··· 179 179 proto = HV_PROTOCOL_HVSI; 180 180 ops = &hvc_opal_hvsi_ops; 181 181 } else { 182 - pr_err("hvc_opal: Unknown protocol for %s\n", 183 - dev->dev.of_node->full_name); 182 + pr_err("hvc_opal: Unknown protocol for %pOF\n", 183 + dev->dev.of_node); 184 184 return -ENXIO; 185 185 } 186 186 ··· 204 204 /* Instanciate now to establish a mapping index==vtermno */ 205 205 hvc_instantiate(termno, termno, ops); 206 206 } else { 207 - pr_err("hvc_opal: Device %s has duplicate terminal number #%d\n", 208 - dev->dev.of_node->full_name, termno); 207 + pr_err("hvc_opal: Device %pOF has duplicate terminal number #%d\n", 208 + dev->dev.of_node, termno); 209 209 return -ENXIO; 210 210 } 211 211 212 - pr_info("hvc%d: %s protocol on %s%s\n", termno, 212 + pr_info("hvc%d: %s protocol on %pOF%s\n", termno, 213 213 proto == HV_PROTOCOL_RAW ? "raw" : "hvsi", 214 - dev->dev.of_node->full_name, 214 + dev->dev.of_node, 215 215 boot ? " (boot console)" : ""); 216 216 217 217 irq = irq_of_parse_and_map(dev->dev.of_node, 0); ··· 222 222 } 223 223 224 224 if (!irq) { 225 - pr_err("hvc_opal: Unable to map interrupt for device %s\n", 226 - dev->dev.of_node->full_name); 225 + pr_err("hvc_opal: Unable to map interrupt for device %pOF\n", 226 + dev->dev.of_node); 227 227 return irq; 228 228 } 229 229
+3 -3
drivers/tty/hvc/hvc_vio.c
··· 312 312 proto = HV_PROTOCOL_HVSI; 313 313 ops = &hvterm_hvsi_ops; 314 314 } else { 315 - pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name); 315 + pr_err("hvc_vio: Unknown protocol for %pOF\n", vdev->dev.of_node); 316 316 return -ENXIO; 317 317 } 318 318 319 - pr_devel("hvc_vio_probe() device %s, using %s protocol\n", 320 - vdev->dev.of_node->full_name, 319 + pr_devel("hvc_vio_probe() device %pOF, using %s protocol\n", 320 + vdev->dev.of_node, 321 321 proto == HV_PROTOCOL_RAW ? "raw" : "hvsi"); 322 322 323 323 /* Is it our boot one ? */
+1 -1
drivers/tty/serdev/core.c
··· 363 363 if (!of_get_property(node, "compatible", NULL)) 364 364 continue; 365 365 366 - dev_dbg(&ctrl->dev, "adding child %s\n", node->full_name); 366 + dev_dbg(&ctrl->dev, "adding child %pOF\n", node); 367 367 368 368 serdev = serdev_device_alloc(ctrl); 369 369 if (!serdev)
+6 -6
drivers/tty/serial/mpc52xx_uart.c
··· 1634 1634 return -EINVAL; 1635 1635 } 1636 1636 1637 - pr_debug("Console on ttyPSC%x is %s\n", 1638 - co->index, mpc52xx_uart_nodes[co->index]->full_name); 1637 + pr_debug("Console on ttyPSC%x is %pOF\n", 1638 + co->index, mpc52xx_uart_nodes[co->index]); 1639 1639 1640 1640 /* Fetch register locations */ 1641 1641 ret = of_address_to_resource(np, 0, &res); ··· 1755 1755 break; 1756 1756 if (idx >= MPC52xx_PSC_MAXNUM) 1757 1757 return -EINVAL; 1758 - pr_debug("Found %s assigned to ttyPSC%x\n", 1759 - mpc52xx_uart_nodes[idx]->full_name, idx); 1758 + pr_debug("Found %pOF assigned to ttyPSC%x\n", 1759 + mpc52xx_uart_nodes[idx], idx); 1760 1760 1761 1761 /* set the uart clock to the input clock of the psc, the different 1762 1762 * prescalers are taken into account in the set_baudrate() methods ··· 1881 1881 1882 1882 for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) { 1883 1883 if (mpc52xx_uart_nodes[i]) 1884 - pr_debug("%s assigned to ttyPSC%x\n", 1885 - mpc52xx_uart_nodes[i]->full_name, i); 1884 + pr_debug("%pOF assigned to ttyPSC%x\n", 1885 + mpc52xx_uart_nodes[i], i); 1886 1886 } 1887 1887 } 1888 1888
+2 -2
drivers/tty/serial/pmac_zilog.c
··· 1671 1671 if (!node_a && !node_b) { 1672 1672 of_node_put(node_a); 1673 1673 of_node_put(node_b); 1674 - printk(KERN_ERR "pmac_zilog: missing node %c for escc %s\n", 1675 - (!node_a) ? 'a' : 'b', node_p->full_name); 1674 + printk(KERN_ERR "pmac_zilog: missing node %c for escc %pOF\n", 1675 + (!node_a) ? 'a' : 'b', node_p); 1676 1676 continue; 1677 1677 } 1678 1678
+2 -2
drivers/tty/serial/sunsu.c
··· 1212 1212 if (up->port.type == PORT_UNKNOWN) 1213 1213 return -ENODEV; 1214 1214 1215 - printk("%s: %s port at %llx, irq %u\n", 1216 - up->port.dev->of_node->full_name, 1215 + printk("%pOF: %s port at %llx, irq %u\n", 1216 + up->port.dev->of_node, 1217 1217 (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse", 1218 1218 (unsigned long long) up->port.mapbase, 1219 1219 up->port.irq);