1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 80dec9796b3..43816d4b3c4 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -91,7 +91,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = hotplug_slot->private;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         kfree(slot->hotplug_slot->info);
         kfree(slot->hotplug_slot);
@@ -195,7 +195,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
 {
         struct slot *slot = get_slot(hotplug_slot);
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         hotplug_slot->info->attention_status = status;
         slot->hpc_ops->set_attention_status(slot, status);
@@ -207,7 +207,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = get_slot(hotplug_slot);
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         return shpchp_sysfs_enable_slot(slot);
 }
@@ -216,7 +216,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot)
 {
         struct slot *slot = get_slot(hotplug_slot);
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         return shpchp_sysfs_disable_slot(slot);
 }
@@ -226,7 +226,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_power_status(slot, value);
         if (retval < 0)
@@ -240,7 +240,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_attention_status(slot, value);
         if (retval < 0)
@@ -254,7 +254,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_latch_status(slot, value);
         if (retval < 0)
@@ -268,7 +268,7 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
         struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_adapter_status(slot, value);
         if (retval < 0)
@@ -282,7 +282,7 @@ static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)
         struct slot *slot = get_slot(hotplug_slot);
         struct pci_bus *bus = slot->ctrl->pci_dev->subordinate;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         *value = (pci_domain_nr(bus) << 16) | (slot->bus << 8) | slot->device;
 
@@ -294,7 +294,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp
         struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_max_bus_speed(slot, value);
         if (retval < 0)
@@ -308,7 +308,7 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp
         struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
-        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
 
         retval = slot->hpc_ops->get_cur_bus_speed(slot, value);
         if (retval < 0)
@@ -338,7 +338,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
         if (!ctrl) {
-                err("%s : out of memory\n", __FUNCTION__);
+                err("%s : out of memory\n", __func__);
                 goto err_out_none;
         }
         INIT_LIST_HEAD(&ctrl->slot_list);
@@ -402,7 +402,7 @@ static int __init shpcd_init(void)
         int retval = 0;
 
         retval = pci_register_driver(&shpc_driver);
-        dbg("%s: pci_register_driver = %d\n", __FUNCTION__, retval);
+        dbg("%s: pci_register_driver = %d\n", __func__, retval);
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
         return retval;
 }