diff options
Diffstat (limited to 'arch/powerpc/platforms/pseries/reconfig.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/reconfig.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index 2800fced8c7c..ac75c10de278 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c | |||
@@ -222,14 +222,14 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length | |||
222 | tmp = strchr(buf, ' '); | 222 | tmp = strchr(buf, ' '); |
223 | if (!tmp) { | 223 | if (!tmp) { |
224 | printk(KERN_ERR "property parse failed in %s at line %d\n", | 224 | printk(KERN_ERR "property parse failed in %s at line %d\n", |
225 | __FUNCTION__, __LINE__); | 225 | __func__, __LINE__); |
226 | return NULL; | 226 | return NULL; |
227 | } | 227 | } |
228 | *tmp = '\0'; | 228 | *tmp = '\0'; |
229 | 229 | ||
230 | if (++tmp >= end) { | 230 | if (++tmp >= end) { |
231 | printk(KERN_ERR "property parse failed in %s at line %d\n", | 231 | printk(KERN_ERR "property parse failed in %s at line %d\n", |
232 | __FUNCTION__, __LINE__); | 232 | __func__, __LINE__); |
233 | return NULL; | 233 | return NULL; |
234 | } | 234 | } |
235 | 235 | ||
@@ -238,12 +238,12 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length | |||
238 | *length = simple_strtoul(tmp, &tmp, 10); | 238 | *length = simple_strtoul(tmp, &tmp, 10); |
239 | if (*length == -1) { | 239 | if (*length == -1) { |
240 | printk(KERN_ERR "property parse failed in %s at line %d\n", | 240 | printk(KERN_ERR "property parse failed in %s at line %d\n", |
241 | __FUNCTION__, __LINE__); | 241 | __func__, __LINE__); |
242 | return NULL; | 242 | return NULL; |
243 | } | 243 | } |
244 | if (*tmp != ' ' || ++tmp >= end) { | 244 | if (*tmp != ' ' || ++tmp >= end) { |
245 | printk(KERN_ERR "property parse failed in %s at line %d\n", | 245 | printk(KERN_ERR "property parse failed in %s at line %d\n", |
246 | __FUNCTION__, __LINE__); | 246 | __func__, __LINE__); |
247 | return NULL; | 247 | return NULL; |
248 | } | 248 | } |
249 | 249 | ||
@@ -252,12 +252,12 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length | |||
252 | tmp += *length; | 252 | tmp += *length; |
253 | if (tmp > end) { | 253 | if (tmp > end) { |
254 | printk(KERN_ERR "property parse failed in %s at line %d\n", | 254 | printk(KERN_ERR "property parse failed in %s at line %d\n", |
255 | __FUNCTION__, __LINE__); | 255 | __func__, __LINE__); |
256 | return NULL; | 256 | return NULL; |
257 | } | 257 | } |
258 | else if (tmp < end && *tmp != ' ' && *tmp != '\0') { | 258 | else if (tmp < end && *tmp != ' ' && *tmp != '\0') { |
259 | printk(KERN_ERR "property parse failed in %s at line %d\n", | 259 | printk(KERN_ERR "property parse failed in %s at line %d\n", |
260 | __FUNCTION__, __LINE__); | 260 | __func__, __LINE__); |
261 | return NULL; | 261 | return NULL; |
262 | } | 262 | } |
263 | tmp++; | 263 | tmp++; |