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

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

drivers/tty/ehv_bytechan.c

+6 −6
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ static int find_console_handle(void) 
	 */

	iprop = of_get_property(np, "hv-handle", NULL);

	if (!iprop) {

		pr_err("ehv-bc: no 'hv-handle' property in %s node\n",

		       np->name);

		pr_err("ehv-bc: no 'hv-handle' property in %pOFn node\n",

		       np);

		return 0;

	}

	stdout_bc = be32_to_cpu(*iprop);
@@ -661,8 +661,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) 


	iprop = of_get_property(np, "hv-handle", NULL);

	if (!iprop) {

		dev_err(&pdev->dev, "no 'hv-handle' property in %s node\n",

			np->name);

		dev_err(&pdev->dev, "no 'hv-handle' property in %pOFn node\n",

			np);

		return -ENODEV;

	}
@@ -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->tx_irq = irq_of_parse_and_map(np, 1);

	if ((bc->rx_irq == NO_IRQ) || (bc->tx_irq == NO_IRQ)) {

		dev_err(&pdev->dev, "no 'interrupts' property in %s node\n",

			np->name);

		dev_err(&pdev->dev, "no 'interrupts' property in %pOFn node\n",

			np);

		ret = -ENODEV;

		goto error;

	}

drivers/tty/serial/cpm_uart/cpm_uart_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1151,8 +1151,8 @@ static int cpm_uart_init_port(struct device_node *np, 
	if (!pinfo->clk) {

		data = of_get_property(np, "fsl,cpm-brg", &len);

		if (!data || len != 4) {

			printk(KERN_ERR "CPM UART %s has no/invalid "

			                "fsl,cpm-brg property.\n", np->name);

			printk(KERN_ERR "CPM UART %pOFn has no/invalid "

			                "fsl,cpm-brg property.\n", np);

			return -EINVAL;

		}

		pinfo->brg = *data;
@@ -1160,8 +1160,8 @@ static int cpm_uart_init_port(struct device_node *np, 


	data = of_get_property(np, "fsl,cpm-command", &len);

	if (!data || len != 4) {

		printk(KERN_ERR "CPM UART %s has no/invalid "

		                "fsl,cpm-command property.\n", np->name);

		printk(KERN_ERR "CPM UART %pOFn has no/invalid "

		                "fsl,cpm-command property.\n", np);

		return -EINVAL;

	}

	pinfo->command = *data;

drivers/tty/serial/pmac_zilog.c

+2 −2
Original line number Diff line number Diff line
@@ -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

	 */

	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",

		       uap->node->name);

		       uap->node);

	else

		uap->flags |= PMACZILOG_FLAG_RSRC_REQUESTED;

CRA Git | Maintained and supported by SUSTech CRA and CCSE