[S390] 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: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 5b47e9cce75f..874adf365e46 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -394,7 +394,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
                         return tape_34xx_erp_failed(request, -ENOSPC);
                 default:
                         PRINT_ERR("Invalid op in %s:%i\n",
-                                  __FUNCTION__, __LINE__);
+                                  __func__, __LINE__);
                         return tape_34xx_erp_failed(request, 0);
                 }
         }
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 6f40facb1c4d..19f8389291b6 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -96,7 +96,7 @@ static int vmwdt_keepalive(void)
 
         if (ret) {
                 printk(KERN_WARNING "%s: problem setting interval %d, "
-                        "cmd %s\n", __FUNCTION__, vmwdt_interval,
+                        "cmd %s\n", __func__, vmwdt_interval,
                         vmwdt_cmd);
         }
         return ret;
@@ -107,7 +107,7 @@ static int vmwdt_disable(void)
         int ret = __diag288(wdt_cancel, 0, "", 0);
         if (ret) {
                 printk(KERN_WARNING "%s: problem disabling watchdog\n",
-                        __FUNCTION__);
+                        __func__);
         }
         return ret;
 }
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index f523501e6e6c..bbbd14e9d48f 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -224,7 +224,7 @@ static int __init init_cpu_info(enum arch_id arch)
 
         sa = kmalloc(sizeof(*sa), GFP_KERNEL);
         if (!sa) {
-                ERROR_MSG("kmalloc failed: %s: %i\n",__FUNCTION__, __LINE__);
+                ERROR_MSG("kmalloc failed: %s: %i\n",__func__, __LINE__);
                 return -ENOMEM;
         }
         if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) {