diff options
Diffstat (limited to 'fs/proc/proc_devtree.c')
-rw-r--r-- | fs/proc/proc_devtree.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index de20ec480fa0..30b590f5bd35 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/time.h> | 8 | #include <linux/time.h> |
9 | #include <linux/proc_fs.h> | 9 | #include <linux/proc_fs.h> |
10 | #include <linux/seq_file.h> | 10 | #include <linux/seq_file.h> |
11 | #include <linux/printk.h> | ||
11 | #include <linux/stat.h> | 12 | #include <linux/stat.h> |
12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
13 | #include <linux/of.h> | 14 | #include <linux/of.h> |
@@ -110,8 +111,8 @@ void proc_device_tree_update_prop(struct proc_dir_entry *pde, | |||
110 | if (ent->data == oldprop) | 111 | if (ent->data == oldprop) |
111 | break; | 112 | break; |
112 | if (ent == NULL) { | 113 | if (ent == NULL) { |
113 | printk(KERN_WARNING "device-tree: property \"%s\" " | 114 | pr_warn("device-tree: property \"%s\" does not exist\n", |
114 | " does not exist\n", oldprop->name); | 115 | oldprop->name); |
115 | } else { | 116 | } else { |
116 | ent->data = newprop; | 117 | ent->data = newprop; |
117 | ent->size = newprop->length; | 118 | ent->size = newprop->length; |
@@ -153,8 +154,8 @@ static const char *fixup_name(struct device_node *np, struct proc_dir_entry *de, | |||
153 | realloc: | 154 | realloc: |
154 | fixed_name = kmalloc(fixup_len, GFP_KERNEL); | 155 | fixed_name = kmalloc(fixup_len, GFP_KERNEL); |
155 | if (fixed_name == NULL) { | 156 | if (fixed_name == NULL) { |
156 | printk(KERN_ERR "device-tree: Out of memory trying to fixup " | 157 | pr_err("device-tree: Out of memory trying to fixup " |
157 | "name \"%s\"\n", name); | 158 | "name \"%s\"\n", name); |
158 | return name; | 159 | return name; |
159 | } | 160 | } |
160 | 161 | ||
@@ -175,8 +176,8 @@ retry: | |||
175 | goto retry; | 176 | goto retry; |
176 | } | 177 | } |
177 | 178 | ||
178 | printk(KERN_WARNING "device-tree: Duplicate name in %s, " | 179 | pr_warn("device-tree: Duplicate name in %s, renamed to \"%s\"\n", |
179 | "renamed to \"%s\"\n", np->full_name, fixed_name); | 180 | np->full_name, fixed_name); |
180 | 181 | ||
181 | return fixed_name; | 182 | return fixed_name; |
182 | } | 183 | } |