aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of/dynamic.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-06-01 16:50:55 -0400
committerRob Herring <robh@kernel.org>2017-07-18 18:09:18 -0400
commit0d638a07d3a1e98a7598eb2812a6236324e4c55f (patch)
tree5cca2869338b69318f5f758b0a6e8cb9ebaad69d /drivers/of/dynamic.c
parentb4032ff9af1c266ca671682117ba73e1ba89a259 (diff)
of: 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>
Diffstat (limited to 'drivers/of/dynamic.c')
-rw-r--r--drivers/of/dynamic.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 0542cf8b6e3d..301b6db2b48d 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -98,14 +98,14 @@ int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p)
98 switch (action) { 98 switch (action) {
99 case OF_RECONFIG_ATTACH_NODE: 99 case OF_RECONFIG_ATTACH_NODE:
100 case OF_RECONFIG_DETACH_NODE: 100 case OF_RECONFIG_DETACH_NODE:
101 pr_debug("notify %-15s %s\n", action_names[action], 101 pr_debug("notify %-15s %pOF\n", action_names[action],
102 pr->dn->full_name); 102 pr->dn);
103 break; 103 break;
104 case OF_RECONFIG_ADD_PROPERTY: 104 case OF_RECONFIG_ADD_PROPERTY:
105 case OF_RECONFIG_REMOVE_PROPERTY: 105 case OF_RECONFIG_REMOVE_PROPERTY:
106 case OF_RECONFIG_UPDATE_PROPERTY: 106 case OF_RECONFIG_UPDATE_PROPERTY:
107 pr_debug("notify %-15s %s:%s\n", action_names[action], 107 pr_debug("notify %-15s %pOF:%s\n", action_names[action],
108 pr->dn->full_name, pr->prop->name); 108 pr->dn, pr->prop->name);
109 break; 109 break;
110 110
111 } 111 }
@@ -328,11 +328,10 @@ void of_node_release(struct kobject *kobj)
328 328
329 /* We should never be releasing nodes that haven't been detached. */ 329 /* We should never be releasing nodes that haven't been detached. */
330 if (!of_node_check_flag(node, OF_DETACHED)) { 330 if (!of_node_check_flag(node, OF_DETACHED)) {
331 pr_err("ERROR: Bad of_node_put() on %s\n", node->full_name); 331 pr_err("ERROR: Bad of_node_put() on %pOF\n", node);
332 dump_stack(); 332 dump_stack();
333 return; 333 return;
334 } 334 }
335
336 if (!of_node_check_flag(node, OF_DYNAMIC)) 335 if (!of_node_check_flag(node, OF_DYNAMIC))
337 return; 336 return;
338 337
@@ -462,13 +461,13 @@ static void __of_changeset_entry_dump(struct of_changeset_entry *ce)
462 case OF_RECONFIG_ADD_PROPERTY: 461 case OF_RECONFIG_ADD_PROPERTY:
463 case OF_RECONFIG_REMOVE_PROPERTY: 462 case OF_RECONFIG_REMOVE_PROPERTY:
464 case OF_RECONFIG_UPDATE_PROPERTY: 463 case OF_RECONFIG_UPDATE_PROPERTY:
465 pr_debug("cset<%p> %-15s %s/%s\n", ce, action_names[ce->action], 464 pr_debug("cset<%p> %-15s %pOF/%s\n", ce, action_names[ce->action],
466 ce->np->full_name, ce->prop->name); 465 ce->np, ce->prop->name);
467 break; 466 break;
468 case OF_RECONFIG_ATTACH_NODE: 467 case OF_RECONFIG_ATTACH_NODE:
469 case OF_RECONFIG_DETACH_NODE: 468 case OF_RECONFIG_DETACH_NODE:
470 pr_debug("cset<%p> %-15s %s\n", ce, action_names[ce->action], 469 pr_debug("cset<%p> %-15s %pOF\n", ce, action_names[ce->action],
471 ce->np->full_name); 470 ce->np);
472 break; 471 break;
473 } 472 }
474} 473}
@@ -539,7 +538,7 @@ static void __of_changeset_entry_notify(struct of_changeset_entry *ce, bool reve
539 } 538 }
540 539
541 if (ret) 540 if (ret)
542 pr_err("changeset notifier error @%s\n", ce->np->full_name); 541 pr_err("changeset notifier error @%pOF\n", ce->np);
543} 542}
544 543
545static int __of_changeset_entry_apply(struct of_changeset_entry *ce) 544static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
@@ -570,8 +569,8 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
570 569
571 ret = __of_add_property(ce->np, ce->prop); 570 ret = __of_add_property(ce->np, ce->prop);
572 if (ret) { 571 if (ret) {
573 pr_err("changeset: add_property failed @%s/%s\n", 572 pr_err("changeset: add_property failed @%pOF/%s\n",
574 ce->np->full_name, 573 ce->np,
575 ce->prop->name); 574 ce->prop->name);
576 break; 575 break;
577 } 576 }
@@ -579,8 +578,8 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
579 case OF_RECONFIG_REMOVE_PROPERTY: 578 case OF_RECONFIG_REMOVE_PROPERTY:
580 ret = __of_remove_property(ce->np, ce->prop); 579 ret = __of_remove_property(ce->np, ce->prop);
581 if (ret) { 580 if (ret) {
582 pr_err("changeset: remove_property failed @%s/%s\n", 581 pr_err("changeset: remove_property failed @%pOF/%s\n",
583 ce->np->full_name, 582 ce->np,
584 ce->prop->name); 583 ce->prop->name);
585 break; 584 break;
586 } 585 }
@@ -598,8 +597,8 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
598 597
599 ret = __of_update_property(ce->np, ce->prop, &old_prop); 598 ret = __of_update_property(ce->np, ce->prop, &old_prop);
600 if (ret) { 599 if (ret) {
601 pr_err("changeset: update_property failed @%s/%s\n", 600 pr_err("changeset: update_property failed @%pOF/%s\n",
602 ce->np->full_name, 601 ce->np,
603 ce->prop->name); 602 ce->prop->name);
604 break; 603 break;
605 } 604 }