Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9ef7b4b authored by Rob Herring's avatar Rob Herring Committed by Michael Ellerman
Browse files

powerpc: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0bdba867

arch/powerpc/platforms/44x/fsp2.c

+4 −4
Original line number Diff line number Diff line
@@ -210,15 +210,15 @@ static void node_irq_request(const char *compat, irq_handler_t errirq_handler) 
	for_each_compatible_node(np, NULL, compat) {

		irq = irq_of_parse_and_map(np, 0);

		if (irq == NO_IRQ) {

			pr_err("device tree node %s is missing a interrupt",

			      np->name);

			pr_err("device tree node %pOFn is missing a interrupt",

			      np);

			return;

		}



		rc = request_irq(irq, errirq_handler, 0, np->name, np);

		if (rc) {

			pr_err("fsp_of_probe: request_irq failed: np=%s rc=%d",

			      np->full_name, rc);

			pr_err("fsp_of_probe: request_irq failed: np=%pOF rc=%d",

			      np, rc);

			return;

		}

	}

arch/powerpc/platforms/cell/spu_manage.c

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ static int __init of_enumerate_spus(int (*fn)(void *data)) 
	for_each_node_by_type(node, "spe") {

		ret = fn(node);

		if (ret) {

			printk(KERN_WARNING "%s: Error initializing %s\n",

				__func__, node->name);

			printk(KERN_WARNING "%s: Error initializing %pOFn\n",

				__func__, node);

			of_node_put(node);

			break;

		}

arch/powerpc/platforms/embedded6xx/wii.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void __iomem *wii_ioremap_hw_regs(char *name, char *compatible) 
	}

	error = of_address_to_resource(np, 0, &res);

	if (error) {

		pr_err("no valid reg found for %s\n", np->name);

		pr_err("no valid reg found for %pOFn\n", np);

		goto out_put;

	}

arch/powerpc/platforms/powernv/opal-powercap.c

+2 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ void __init opal_powercap_init(void) 
		}



		j = 0;

		pcaps[i].pg.name = node->name;

		pcaps[i].pg.name = kasprintf(GFP_KERNEL, "%pOFn", node);

		if (has_min) {

			powercap_add_attr(min, "powercap-min",

					  &pcaps[i].pattrs[j]);
@@ -237,6 +237,7 @@ void __init opal_powercap_init(void) 
	while (--i >= 0) {

		kfree(pcaps[i].pattrs);

		kfree(pcaps[i].pg.attrs);

		kfree(pcaps[i].pg.name);

	}

	kobject_put(powercap_kobj);

out_pcaps:

arch/powerpc/platforms/powernv/opal-sensor-groups.c

+2 −2
Original line number Diff line number Diff line
@@ -214,9 +214,9 @@ void __init opal_sensor_groups_init(void) 
		}



		if (!of_property_read_u32(node, "ibm,chip-id", &chipid))

			sprintf(sgs[i].name, "%s%d", node->name, chipid);

			sprintf(sgs[i].name, "%pOFn%d", node, chipid);

		else

			sprintf(sgs[i].name, "%s", node->name);

			sprintf(sgs[i].name, "%pOFn", node);



		sgs[i].sg.name = sgs[i].name;

		if (add_attr_group(ops, len, &sgs[i], sgid)) {