Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[sfrench/cifs-2.6.git] / drivers / pci / hotplug / rpaphp_core.c

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 58f1a9927709817d5f97c74d64f4cc646014fdf9..1f84f402acdbdfbffad7ac13cb56597690a0561f 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -317,7 +317,7 @@ int rpaphp_add_slot(struct device_node *dn)
        if (!is_php_dn(dn, &indexes, &names, &types, &power_domains))
                return 0;
 
-       dbg("Entry %s: dn->full_name=%s\n", __FUNCTION__, dn->full_name);
+       dbg("Entry %s: dn->full_name=%s\n", __func__, dn->full_name);
 
        /* register PCI devices */
        name = (char *) &names[1];
@@ -343,7 +343,7 @@ int rpaphp_add_slot(struct device_node *dn)
                name += strlen(name) + 1;
                type += strlen(type) + 1;
        }
-       dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+       dbg("%s - Exit: rc[%d]\n", __func__, retval);
 
        /* XXX FIXME: reports a failure only if last entry in loop failed */
        return retval;
@@ -404,7 +404,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
        } else if (state == EMPTY) {
                slot->state = EMPTY;
        } else {
-               err("%s: slot[%s] is in invalid state\n", __FUNCTION__, slot->name);
+               err("%s: slot[%s] is in invalid state\n", __func__, slot->name);
                slot->state = NOT_VALID;
                return -EINVAL;
        }