[POWERPC] Replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

8 files changed, 27 insertions, 27 deletions

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 2f50bb5d00f9..9971159c8040 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
                 ret = ibmebus_create_device(child);
                 if (ret) {
                         printk(KERN_ERR "%s: failed to create device (%i)",
-                               __FUNCTION__, ret);
+                               __func__, ret);
                         of_node_put(child);
                         break;
                 }
@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
         if (bus_find_device(&ibmebus_bus_type, NULL, path,
                             ibmebus_match_path)) {
                 printk(KERN_WARNING "%s: %s has already been probed\n",
-                       __FUNCTION__, path);
+                       __func__, path);
                 rc = -EEXIST;
                 goto out;
         }
@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
                 of_node_put(dn);
         } else {
                 printk(KERN_WARNING "%s: no such device node: %s\n",
-                       __FUNCTION__, path);
+                       __func__, path);
                 rc = -ENODEV;
         }
 
@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
                 return count;
         } else {
                 printk(KERN_WARNING "%s: %s not on the bus\n",
-                       __FUNCTION__, path);
+                       __func__, path);
 
                 kfree(path);
                 return -ENODEV;
@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void)
         err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
         if (err) {
                 printk(KERN_ERR "%s: failed to register IBM eBus.\n",
-                       __FUNCTION__);
+                       __func__);
                 return err;
         }
 
         err = device_register(&ibmebus_bus_device);
         if (err) {
                 printk(KERN_WARNING "%s: device_register returned %i\n",
-                       __FUNCTION__, err);
+                       __func__, err);
                 bus_unregister(&ibmebus_bus_type);
 
                 return err;
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 8f1f4e539c4b..0c663669bc32 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name)
         unsigned int order;
 
         if (!tbl || !tbl->it_map) {
-                printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__,
+                printk(KERN_ERR "%s: expected TCE map for %s\n", __func__,
                                 node_name);
                 return;
         }
@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name)
         for (i = 0; i < (tbl->it_size/64); i++) {
                 if (tbl->it_map[i] != 0) {
                         printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
-                                __FUNCTION__, node_name);
+                                __func__, node_name);
                         break;
                 }
         }
diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c
index ee172aa42aa7..d73551da2ff1 100644
--- a/arch/powerpc/kernel/isa-bridge.c
+++ b/arch/powerpc/kernel/isa-bridge.c
@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
          */
         if ((pci_addr != 0) || (isa_addr != 0)) {
                 printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
-                       __FUNCTION__);
+                       __func__);
                 return;
         }
 
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index dcb89a88df46..1ffacc698ffb 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -226,7 +226,7 @@ static void parse_system_parameter_string(struct seq_file *m)
         unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
         if (!local_buffer) {
                 printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
-                       __FILE__, __FUNCTION__, __LINE__);
+                       __FILE__, __func__, __LINE__);
                 return;
         }
 
@@ -243,14 +243,14 @@ static void parse_system_parameter_string(struct seq_file *m)
         if (call_status != 0) {
                 printk(KERN_INFO
                        "%s %s Error calling get-system-parameter (0x%x)\n",
-                       __FILE__, __FUNCTION__, call_status);
+                       __FILE__, __func__, call_status);
         } else {
                 int splpar_strlen;
                 int idx, w_idx;
                 char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
                 if (!workbuffer) {
                         printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
-                               __FILE__, __FUNCTION__, __LINE__);
+                               __FILE__, __func__, __LINE__);
                         kfree(local_buffer);
                         return;
                 }
@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,
         current_weight = (resource >> 5 * 8) & 0xFF;
 
         pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
-                 __FUNCTION__, current_entitled, current_weight);
+                 __func__, current_entitled, current_weight);
 
         pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
-                 __FUNCTION__, *new_entitled_ptr, *new_weight_ptr);
+                 __func__, *new_entitled_ptr, *new_weight_ptr);
 
         retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
                                     *new_weight_ptr);
@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,
                 retval = -EINVAL;
         } else {
                 printk(KERN_WARNING "%s: received unknown hv return code %ld",
-                       __FUNCTION__, retval);
+                       __func__, retval);
                 retval = -EIO;
         }
 
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index e2e78d967f31..eb3beea4536e 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -507,7 +507,7 @@ int rtas_error_rc(int rtas_rc)
                         break;
                 default:
                         printk(KERN_ERR "%s: unexpected RTAS error %d\n",
-                                        __FUNCTION__, rtas_rc);
+                                        __func__, rtas_rc);
                         rc = -ERANGE;
                         break;
         }
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index f2276593f416..e1756e112344 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -807,7 +807,7 @@ int __init rtas_flash_init(void)
                                 rtas_block_ctor);
         if (!flash_block_cache) {
                 printk(KERN_ERR "%s: failed to create block cache\n",
-                                __FUNCTION__);
+                                __func__);
                 rc = -ENOMEM;
                 goto cleanup;
         }
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 433a0a0949fb..945e8f4db873 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -326,7 +326,7 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
 
         res = b->resource[0];
         if (!res->flags) {
-                printk(KERN_ERR "%s: no IO resource for PHB %s\n", __FUNCTION__,
+                printk(KERN_ERR "%s: no IO resource for PHB %s\n", __func__,
                                 b->name);
                 return 1;
         }
@@ -334,13 +334,13 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
         rc = pcibios_unmap_io_space(b);
         if (rc) {
                 printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",
-                        __FUNCTION__, b->name);
+                        __func__, b->name);
                 return 1;
         }
 
         if (release_resource(res)) {
                 printk(KERN_ERR "%s: failed to release IO on bus %s\n",
-                                __FUNCTION__, b->name);
+                                __func__, b->name);
                 return 1;
         }
 
@@ -348,13 +348,13 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
                 res = b->resource[i];
                 if (!res->flags && i == 0) {
                         printk(KERN_ERR "%s: no MEM resource for PHB %s\n",
-                                __FUNCTION__, b->name);
+                                __func__, b->name);
                         return 1;
                 }
                 if (res->flags && release_resource(res)) {
                         printk(KERN_ERR
                                "%s: failed to release IO %d on bus %s\n",
-                                __FUNCTION__, i, b->name);
+                                __func__, i, b->name);
                         return 1;
                 }
         }
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index f98867252ee2..b77f8af7ddde 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device *dev)
  */
 int vio_register_driver(struct vio_driver *viodrv)
 {
-        printk(KERN_DEBUG "%s: driver %s registering\n", __FUNCTION__,
+        printk(KERN_DEBUG "%s: driver %s registering\n", __func__,
                 viodrv->driver.name);
 
         /* fill in 'struct driver' fields */
@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
         /* we need the 'device_type' property, in order to match with drivers */
         if (of_node->type == NULL) {
                 printk(KERN_WARNING "%s: node %s missing 'device_type'\n",
-                                __FUNCTION__,
+                                __func__,
                                 of_node->name ? of_node->name : "<unknown>");
                 return NULL;
         }
@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
         unit_address = of_get_property(of_node, "reg", NULL);
         if (unit_address == NULL) {
                 printk(KERN_WARNING "%s: node %s missing 'reg'\n",
-                                __FUNCTION__,
+                                __func__,
                                 of_node->name ? of_node->name : "<unknown>");
                 return NULL;
         }
@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
         /* register with generic device framework */
         if (device_register(&viodev->dev)) {
                 printk(KERN_ERR "%s: failed to register device %s\n",
-                                __FUNCTION__, viodev->dev.bus_id);
+                                __func__, viodev->dev.bus_id);
                 /* XXX free TCE table */
                 kfree(viodev);
                 return NULL;
@@ -258,7 +258,7 @@ static int __init vio_bus_init(void)
         err = device_register(&vio_bus_device.dev);
         if (err) {
                 printk(KERN_WARNING "%s: device_register returned %i\n",
-                                __FUNCTION__, err);
+                                __func__, err);
                 return err;
         }