summaryrefslogtreecommitdiffstats
path: root/drivers/of/base.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/base.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/base.c')
-rw-r--r--drivers/of/base.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 686628d1dfa6..5551ac2a9d4c 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -160,7 +160,7 @@ int __of_add_property_sysfs(struct device_node *np, struct property *pp)
160 pp->attr.read = of_node_property_read; 160 pp->attr.read = of_node_property_read;
161 161
162 rc = sysfs_create_bin_file(&np->kobj, &pp->attr); 162 rc = sysfs_create_bin_file(&np->kobj, &pp->attr);
163 WARN(rc, "error adding attribute %s to node %s\n", pp->name, np->full_name); 163 WARN(rc, "error adding attribute %s to node %pOF\n", pp->name, np);
164 return rc; 164 return rc;
165} 165}
166 166
@@ -1122,7 +1122,7 @@ EXPORT_SYMBOL(of_find_node_by_phandle);
1122void of_print_phandle_args(const char *msg, const struct of_phandle_args *args) 1122void of_print_phandle_args(const char *msg, const struct of_phandle_args *args)
1123{ 1123{
1124 int i; 1124 int i;
1125 printk("%s %s", msg, of_node_full_name(args->np)); 1125 printk("%s %pOF", msg, args->np);
1126 for (i = 0; i < args->args_count; i++) { 1126 for (i = 0; i < args->args_count; i++) {
1127 const char delim = i ? ',' : ':'; 1127 const char delim = i ? ',' : ':';
1128 1128
@@ -1184,17 +1184,17 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it)
1184 1184
1185 if (it->cells_name) { 1185 if (it->cells_name) {
1186 if (!it->node) { 1186 if (!it->node) {
1187 pr_err("%s: could not find phandle\n", 1187 pr_err("%pOF: could not find phandle\n",
1188 it->parent->full_name); 1188 it->parent);
1189 goto err; 1189 goto err;
1190 } 1190 }
1191 1191
1192 if (of_property_read_u32(it->node, it->cells_name, 1192 if (of_property_read_u32(it->node, it->cells_name,
1193 &count)) { 1193 &count)) {
1194 pr_err("%s: could not get %s for %s\n", 1194 pr_err("%pOF: could not get %s for %pOF\n",
1195 it->parent->full_name, 1195 it->parent,
1196 it->cells_name, 1196 it->cells_name,
1197 it->node->full_name); 1197 it->node);
1198 goto err; 1198 goto err;
1199 } 1199 }
1200 } else { 1200 } else {
@@ -1206,8 +1206,8 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it)
1206 * property data length 1206 * property data length
1207 */ 1207 */
1208 if (it->cur + count > it->list_end) { 1208 if (it->cur + count > it->list_end) {
1209 pr_err("%s: arguments longer than property\n", 1209 pr_err("%pOF: arguments longer than property\n",
1210 it->parent->full_name); 1210 it->parent);
1211 goto err; 1211 goto err;
1212 } 1212 }
1213 } 1213 }
@@ -1639,8 +1639,8 @@ static void of_alias_add(struct alias_prop *ap, struct device_node *np,
1639 strncpy(ap->stem, stem, stem_len); 1639 strncpy(ap->stem, stem, stem_len);
1640 ap->stem[stem_len] = 0; 1640 ap->stem[stem_len] = 0;
1641 list_add_tail(&ap->link, &aliases_lookup); 1641 list_add_tail(&ap->link, &aliases_lookup);
1642 pr_debug("adding DT alias:%s: stem=%s id=%i node=%s\n", 1642 pr_debug("adding DT alias:%s: stem=%s id=%i node=%pOF\n",
1643 ap->alias, ap->stem, ap->id, of_node_full_name(np)); 1643 ap->alias, ap->stem, ap->id, np);
1644} 1644}
1645 1645
1646/** 1646/**