Commit fff10721 authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman

tty: Convert to using %pOFn instead of device_node.name

In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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: linux-serial@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a27d9382
...@@ -128,8 +128,8 @@ static int find_console_handle(void) ...@@ -128,8 +128,8 @@ static int find_console_handle(void)
*/ */
iprop = of_get_property(np, "hv-handle", NULL); iprop = of_get_property(np, "hv-handle", NULL);
if (!iprop) { if (!iprop) {
pr_err("ehv-bc: no 'hv-handle' property in %s node\n", pr_err("ehv-bc: no 'hv-handle' property in %pOFn node\n",
np->name); np);
return 0; return 0;
} }
stdout_bc = be32_to_cpu(*iprop); stdout_bc = be32_to_cpu(*iprop);
...@@ -661,8 +661,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) ...@@ -661,8 +661,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev)
iprop = of_get_property(np, "hv-handle", NULL); iprop = of_get_property(np, "hv-handle", NULL);
if (!iprop) { if (!iprop) {
dev_err(&pdev->dev, "no 'hv-handle' property in %s node\n", dev_err(&pdev->dev, "no 'hv-handle' property in %pOFn node\n",
np->name); np);
return -ENODEV; return -ENODEV;
} }
...@@ -682,8 +682,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) ...@@ -682,8 +682,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev)
bc->rx_irq = irq_of_parse_and_map(np, 0); bc->rx_irq = irq_of_parse_and_map(np, 0);
bc->tx_irq = irq_of_parse_and_map(np, 1); bc->tx_irq = irq_of_parse_and_map(np, 1);
if ((bc->rx_irq == NO_IRQ) || (bc->tx_irq == NO_IRQ)) { if ((bc->rx_irq == NO_IRQ) || (bc->tx_irq == NO_IRQ)) {
dev_err(&pdev->dev, "no 'interrupts' property in %s node\n", dev_err(&pdev->dev, "no 'interrupts' property in %pOFn node\n",
np->name); np);
ret = -ENODEV; ret = -ENODEV;
goto error; goto error;
} }
......
...@@ -1151,8 +1151,8 @@ static int cpm_uart_init_port(struct device_node *np, ...@@ -1151,8 +1151,8 @@ static int cpm_uart_init_port(struct device_node *np,
if (!pinfo->clk) { if (!pinfo->clk) {
data = of_get_property(np, "fsl,cpm-brg", &len); data = of_get_property(np, "fsl,cpm-brg", &len);
if (!data || len != 4) { if (!data || len != 4) {
printk(KERN_ERR "CPM UART %s has no/invalid " printk(KERN_ERR "CPM UART %pOFn has no/invalid "
"fsl,cpm-brg property.\n", np->name); "fsl,cpm-brg property.\n", np);
return -EINVAL; return -EINVAL;
} }
pinfo->brg = *data; pinfo->brg = *data;
...@@ -1160,8 +1160,8 @@ static int cpm_uart_init_port(struct device_node *np, ...@@ -1160,8 +1160,8 @@ static int cpm_uart_init_port(struct device_node *np,
data = of_get_property(np, "fsl,cpm-command", &len); data = of_get_property(np, "fsl,cpm-command", &len);
if (!data || len != 4) { if (!data || len != 4) {
printk(KERN_ERR "CPM UART %s has no/invalid " printk(KERN_ERR "CPM UART %pOFn has no/invalid "
"fsl,cpm-command property.\n", np->name); "fsl,cpm-command property.\n", np);
return -EINVAL; return -EINVAL;
} }
pinfo->command = *data; pinfo->command = *data;
......
...@@ -1566,9 +1566,9 @@ static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match) ...@@ -1566,9 +1566,9 @@ static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match)
* to work around bugs in ancient Apple device-trees * to work around bugs in ancient Apple device-trees
*/ */
if (macio_request_resources(uap->dev, "pmac_zilog")) if (macio_request_resources(uap->dev, "pmac_zilog"))
printk(KERN_WARNING "%s: Failed to request resource" printk(KERN_WARNING "%pOFn: Failed to request resource"
", port still active\n", ", port still active\n",
uap->node->name); uap->node);
else else
uap->flags |= PMACZILOG_FLAG_RSRC_REQUESTED; uap->flags |= PMACZILOG_FLAG_RSRC_REQUESTED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment