Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 9fb6b86cf6b1..2fa545a63160 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -101,7 +101,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
         int retval = 0;
 
         pr_debug("kobject: '%s' (%p): %s\n",
-                 kobject_name(kobj), kobj, __FUNCTION__);
+                 kobject_name(kobj), kobj, __func__);
 
         /* search the kset we belong to */
         top_kobj = kobj;
@@ -111,7 +111,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
         if (!top_kobj->kset) {
                 pr_debug("kobject: '%s' (%p): %s: attempted to send uevent "
                          "without kset!\n", kobject_name(kobj), kobj,
-                         __FUNCTION__);
+                         __func__);
                 return -EINVAL;
         }
 
@@ -123,7 +123,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 if (!uevent_ops->filter(kset, kobj)) {
                         pr_debug("kobject: '%s' (%p): %s: filter function "
                                  "caused the event to drop!\n",
-                                 kobject_name(kobj), kobj, __FUNCTION__);
+                                 kobject_name(kobj), kobj, __func__);
                         return 0;
                 }
 
@@ -135,7 +135,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
         if (!subsystem) {
                 pr_debug("kobject: '%s' (%p): %s: unset subsystem caused the "
                          "event to drop!\n", kobject_name(kobj), kobj,
-                         __FUNCTION__);
+                         __func__);
                 return 0;
         }
 
@@ -177,7 +177,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 if (retval) {
                         pr_debug("kobject: '%s' (%p): %s: uevent() returned "
                                  "%d\n", kobject_name(kobj), kobj,
-                                 __FUNCTION__, retval);
+                                 __func__, retval);
                         goto exit;
                 }
         }