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

MIPS: 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.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20315/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: John Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org

authored by

Rob Herring and committed by
Paul Burton
9475e90f 33f2ac54

+19 -19
+8 -8
arch/mips/cavium-octeon/octeon-irq.c
··· 1180 1180 type = IRQ_TYPE_LEVEL_LOW; 1181 1181 break; 1182 1182 default: 1183 - pr_err("Error: (%s) Invalid irq trigger specification: %x\n", 1184 - node->name, 1183 + pr_err("Error: (%pOFn) Invalid irq trigger specification: %x\n", 1184 + node, 1185 1185 trigger); 1186 1186 type = IRQ_TYPE_LEVEL_LOW; 1187 1187 break; ··· 2271 2271 2272 2272 parent_irq = irq_of_parse_and_map(ciu_node, 0); 2273 2273 if (!parent_irq) { 2274 - pr_err("ERROR: Couldn't acquire parent_irq for %s\n", 2275 - ciu_node->name); 2274 + pr_err("ERROR: Couldn't acquire parent_irq for %pOFn\n", 2275 + ciu_node); 2276 2276 return -EINVAL; 2277 2277 } 2278 2278 ··· 2283 2283 2284 2284 addr = of_get_address(ciu_node, 0, NULL, NULL); 2285 2285 if (!addr) { 2286 - pr_err("ERROR: Couldn't acquire reg(0) %s\n", ciu_node->name); 2286 + pr_err("ERROR: Couldn't acquire reg(0) %pOFn\n", ciu_node); 2287 2287 return -EINVAL; 2288 2288 } 2289 2289 host_data->raw_reg = (u64)phys_to_virt( ··· 2291 2291 2292 2292 addr = of_get_address(ciu_node, 1, NULL, NULL); 2293 2293 if (!addr) { 2294 - pr_err("ERROR: Couldn't acquire reg(1) %s\n", ciu_node->name); 2294 + pr_err("ERROR: Couldn't acquire reg(1) %pOFn\n", ciu_node); 2295 2295 return -EINVAL; 2296 2296 } 2297 2297 host_data->en_reg = (u64)phys_to_virt( ··· 2299 2299 2300 2300 r = of_property_read_u32(ciu_node, "cavium,max-bits", &val); 2301 2301 if (r) { 2302 - pr_err("ERROR: Couldn't read cavium,max-bits from %s\n", 2303 - ciu_node->name); 2302 + pr_err("ERROR: Couldn't read cavium,max-bits from %pOFn\n", 2303 + ciu_node); 2304 2304 return r; 2305 2305 } 2306 2306 host_data->max_bits = val;
+7 -7
arch/mips/netlogic/common/irq.c
··· 291 291 /* we need a hack to get the PIC's SoC chip id */ 292 292 ret = of_address_to_resource(node, 0, &res); 293 293 if (ret < 0) { 294 - pr_err("PIC %s: reg property not found!\n", node->name); 294 + pr_err("PIC %pOFn: reg property not found!\n", node); 295 295 return -EINVAL; 296 296 } 297 297 ··· 304 304 break; 305 305 } 306 306 if (socid == NLM_NR_NODES) { 307 - pr_err("PIC %s: Node mapping for bus %d not found!\n", 308 - node->name, bus); 307 + pr_err("PIC %pOFn: Node mapping for bus %d not found!\n", 308 + node, bus); 309 309 return -EINVAL; 310 310 } 311 311 } else { 312 312 socid = (res.start >> 18) & 0x3; 313 313 if (!nlm_node_present(socid)) { 314 - pr_err("PIC %s: node %d does not exist!\n", 315 - node->name, socid); 314 + pr_err("PIC %pOFn: node %d does not exist!\n", 315 + node, socid); 316 316 return -EINVAL; 317 317 } 318 318 } 319 319 320 320 if (!nlm_node_present(socid)) { 321 - pr_err("PIC %s: node %d does not exist!\n", node->name, socid); 321 + pr_err("PIC %pOFn: node %d does not exist!\n", node, socid); 322 322 return -EINVAL; 323 323 } 324 324 ··· 326 326 nlm_irq_to_xirq(socid, PIC_IRQ_BASE), PIC_IRQ_BASE, 327 327 &xlp_pic_irq_domain_ops, NULL); 328 328 if (xlp_pic_domain == NULL) { 329 - pr_err("PIC %s: Creating legacy domain failed!\n", node->name); 329 + pr_err("PIC %pOFn: Creating legacy domain failed!\n", node); 330 330 return -EINVAL; 331 331 } 332 332 pr_info("Node %d: IRQ domain created for PIC@%pR\n", socid, &res);
+3 -3
arch/mips/ralink/cevt-rt3352.c
··· 134 134 systick.dev.min_delta_ticks = 0x3; 135 135 systick.dev.irq = irq_of_parse_and_map(np, 0); 136 136 if (!systick.dev.irq) { 137 - pr_err("%s: request_irq failed", np->name); 137 + pr_err("%pOFn: request_irq failed", np); 138 138 return -EINVAL; 139 139 } 140 140 ··· 146 146 147 147 clockevents_register_device(&systick.dev); 148 148 149 - pr_info("%s: running - mult: %d, shift: %d\n", 150 - np->name, systick.dev.mult, systick.dev.shift); 149 + pr_info("%pOFn: running - mult: %d, shift: %d\n", 150 + np, systick.dev.mult, systick.dev.shift); 151 151 152 152 return 0; 153 153 }
+1 -1
arch/mips/ralink/ill_acc.c
··· 62 62 63 63 pdev = of_find_device_by_node(np); 64 64 if (!pdev) { 65 - pr_err("%s: failed to lookup pdev\n", np->name); 65 + pr_err("%pOFn: failed to lookup pdev\n", np); 66 66 return -EINVAL; 67 67 } 68 68