git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Replace remaining __FUNCTION__ occurrences
[safe/jmp/linux-2.6]
/
arch
/
powerpc
/
platforms
/
pseries
/
reconfig.c
diff --git
a/arch/powerpc/platforms/pseries/reconfig.c
b/arch/powerpc/platforms/pseries/reconfig.c
index
2800fce
..
ac75c10
100644
(file)
--- 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
tmp = strchr(buf, ' ');
if (!tmp) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
tmp = strchr(buf, ' ');
if (!tmp) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
- __
FUNCTION
__, __LINE__);
+ __
func
__, __LINE__);
return NULL;
}
*tmp = '\0';
if (++tmp >= end) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
return NULL;
}
*tmp = '\0';
if (++tmp >= end) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
- __
FUNCTION
__, __LINE__);
+ __
func
__, __LINE__);
return NULL;
}
return NULL;
}
@@
-238,12
+238,12
@@
static char * parse_next_property(char *buf, char *end, char **name, int *length
*length = simple_strtoul(tmp, &tmp, 10);
if (*length == -1) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
*length = simple_strtoul(tmp, &tmp, 10);
if (*length == -1) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
- __
FUNCTION
__, __LINE__);
+ __
func
__, __LINE__);
return NULL;
}
if (*tmp != ' ' || ++tmp >= end) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
return NULL;
}
if (*tmp != ' ' || ++tmp >= end) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
- __
FUNCTION
__, __LINE__);
+ __
func
__, __LINE__);
return NULL;
}
return NULL;
}
@@
-252,12
+252,12
@@
static char * parse_next_property(char *buf, char *end, char **name, int *length
tmp += *length;
if (tmp > end) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
tmp += *length;
if (tmp > end) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
- __
FUNCTION
__, __LINE__);
+ __
func
__, __LINE__);
return NULL;
}
else if (tmp < end && *tmp != ' ' && *tmp != '\0') {
printk(KERN_ERR "property parse failed in %s at line %d\n",
return NULL;
}
else if (tmp < end && *tmp != ' ' && *tmp != '\0') {
printk(KERN_ERR "property parse failed in %s at line %d\n",
- __
FUNCTION
__, __LINE__);
+ __
func
__, __LINE__);
return NULL;
}
tmp++;
return NULL;
}
tmp++;