lib: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
af1f16d08f
commit
810304db75
@ -90,7 +90,7 @@ static void fill_kobj_path(struct kobject *kobj, char *path, int length)
|
|||||||
}
|
}
|
||||||
|
|
||||||
pr_debug("kobject: '%s' (%p): %s: path = '%s'\n", kobject_name(kobj),
|
pr_debug("kobject: '%s' (%p): %s: path = '%s'\n", kobject_name(kobj),
|
||||||
kobj, __FUNCTION__, path);
|
kobj, __func__, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -181,7 +181,7 @@ static int kobject_add_internal(struct kobject *kobj)
|
|||||||
}
|
}
|
||||||
|
|
||||||
pr_debug("kobject: '%s' (%p): %s: parent: '%s', set: '%s'\n",
|
pr_debug("kobject: '%s' (%p): %s: parent: '%s', set: '%s'\n",
|
||||||
kobject_name(kobj), kobj, __FUNCTION__,
|
kobject_name(kobj), kobj, __func__,
|
||||||
parent ? kobject_name(parent) : "<NULL>",
|
parent ? kobject_name(parent) : "<NULL>",
|
||||||
kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>");
|
kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>");
|
||||||
|
|
||||||
@ -196,10 +196,10 @@ static int kobject_add_internal(struct kobject *kobj)
|
|||||||
printk(KERN_ERR "%s failed for %s with "
|
printk(KERN_ERR "%s failed for %s with "
|
||||||
"-EEXIST, don't try to register things with "
|
"-EEXIST, don't try to register things with "
|
||||||
"the same name in the same directory.\n",
|
"the same name in the same directory.\n",
|
||||||
__FUNCTION__, kobject_name(kobj));
|
__func__, kobject_name(kobj));
|
||||||
else
|
else
|
||||||
printk(KERN_ERR "%s failed for %s (%d)\n",
|
printk(KERN_ERR "%s failed for %s (%d)\n",
|
||||||
__FUNCTION__, kobject_name(kobj), error);
|
__func__, kobject_name(kobj), error);
|
||||||
dump_stack();
|
dump_stack();
|
||||||
} else
|
} else
|
||||||
kobj->state_in_sysfs = 1;
|
kobj->state_in_sysfs = 1;
|
||||||
@ -540,7 +540,7 @@ static void kobject_cleanup(struct kobject *kobj)
|
|||||||
const char *name = kobj->name;
|
const char *name = kobj->name;
|
||||||
|
|
||||||
pr_debug("kobject: '%s' (%p): %s\n",
|
pr_debug("kobject: '%s' (%p): %s\n",
|
||||||
kobject_name(kobj), kobj, __FUNCTION__);
|
kobject_name(kobj), kobj, __func__);
|
||||||
|
|
||||||
if (t && !t->release)
|
if (t && !t->release)
|
||||||
pr_debug("kobject: '%s' (%p): does not have a release() "
|
pr_debug("kobject: '%s' (%p): does not have a release() "
|
||||||
@ -600,7 +600,7 @@ void kobject_put(struct kobject *kobj)
|
|||||||
|
|
||||||
static void dynamic_kobj_release(struct kobject *kobj)
|
static void dynamic_kobj_release(struct kobject *kobj)
|
||||||
{
|
{
|
||||||
pr_debug("kobject: (%p): %s\n", kobj, __FUNCTION__);
|
pr_debug("kobject: (%p): %s\n", kobj, __func__);
|
||||||
kfree(kobj);
|
kfree(kobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -657,7 +657,7 @@ struct kobject *kobject_create_and_add(const char *name, struct kobject *parent)
|
|||||||
retval = kobject_add(kobj, parent, "%s", name);
|
retval = kobject_add(kobj, parent, "%s", name);
|
||||||
if (retval) {
|
if (retval) {
|
||||||
printk(KERN_WARNING "%s: kobject_add error: %d\n",
|
printk(KERN_WARNING "%s: kobject_add error: %d\n",
|
||||||
__FUNCTION__, retval);
|
__func__, retval);
|
||||||
kobject_put(kobj);
|
kobject_put(kobj);
|
||||||
kobj = NULL;
|
kobj = NULL;
|
||||||
}
|
}
|
||||||
@ -765,7 +765,7 @@ static void kset_release(struct kobject *kobj)
|
|||||||
{
|
{
|
||||||
struct kset *kset = container_of(kobj, struct kset, kobj);
|
struct kset *kset = container_of(kobj, struct kset, kobj);
|
||||||
pr_debug("kobject: '%s' (%p): %s\n",
|
pr_debug("kobject: '%s' (%p): %s\n",
|
||||||
kobject_name(kobj), kobj, __FUNCTION__);
|
kobject_name(kobj), kobj, __func__);
|
||||||
kfree(kset);
|
kfree(kset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
|
|||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
|
||||||
pr_debug("kobject: '%s' (%p): %s\n",
|
pr_debug("kobject: '%s' (%p): %s\n",
|
||||||
kobject_name(kobj), kobj, __FUNCTION__);
|
kobject_name(kobj), kobj, __func__);
|
||||||
|
|
||||||
/* search the kset we belong to */
|
/* search the kset we belong to */
|
||||||
top_kobj = kobj;
|
top_kobj = kobj;
|
||||||
@ -111,7 +111,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
|
|||||||
if (!top_kobj->kset) {
|
if (!top_kobj->kset) {
|
||||||
pr_debug("kobject: '%s' (%p): %s: attempted to send uevent "
|
pr_debug("kobject: '%s' (%p): %s: attempted to send uevent "
|
||||||
"without kset!\n", kobject_name(kobj), kobj,
|
"without kset!\n", kobject_name(kobj), kobj,
|
||||||
__FUNCTION__);
|
__func__);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -123,7 +123,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
|
|||||||
if (!uevent_ops->filter(kset, kobj)) {
|
if (!uevent_ops->filter(kset, kobj)) {
|
||||||
pr_debug("kobject: '%s' (%p): %s: filter function "
|
pr_debug("kobject: '%s' (%p): %s: filter function "
|
||||||
"caused the event to drop!\n",
|
"caused the event to drop!\n",
|
||||||
kobject_name(kobj), kobj, __FUNCTION__);
|
kobject_name(kobj), kobj, __func__);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
|
|||||||
if (!subsystem) {
|
if (!subsystem) {
|
||||||
pr_debug("kobject: '%s' (%p): %s: unset subsystem caused the "
|
pr_debug("kobject: '%s' (%p): %s: unset subsystem caused the "
|
||||||
"event to drop!\n", kobject_name(kobj), kobj,
|
"event to drop!\n", kobject_name(kobj), kobj,
|
||||||
__FUNCTION__);
|
__func__);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -177,7 +177,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
|
|||||||
if (retval) {
|
if (retval) {
|
||||||
pr_debug("kobject: '%s' (%p): %s: uevent() returned "
|
pr_debug("kobject: '%s' (%p): %s: uevent() returned "
|
||||||
"%d\n", kobject_name(kobj), kobj,
|
"%d\n", kobject_name(kobj), kobj,
|
||||||
__FUNCTION__, retval);
|
__func__, retval);
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user