powerpc: Convert last uses of __FUNCTION__ to __func__
authorJoe Perches <joe@perches.com>
Tue, 25 Mar 2014 19:35:03 +0000 (12:35 -0700)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Apr 2014 02:53:32 +0000 (12:53 +1000)
Just about all of these have been converted to __func__,
so convert the last uses.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/pseries/nvram.c

index d7096f2..0cc240b 100644 (file)
@@ -298,13 +298,13 @@ int nvram_write_os_partition(struct nvram_os_partition *part, char * buff,
 
        rc = ppc_md.nvram_write((char *)&info, sizeof(struct err_log_info), &tmp_index);
        if (rc <= 0) {
-               pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc);
+               pr_err("%s: Failed nvram_write (%d)\n", __func__, rc);
                return rc;
        }
 
        rc = ppc_md.nvram_write(buff, length, &tmp_index);
        if (rc <= 0) {
-               pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc);
+               pr_err("%s: Failed nvram_write (%d)\n", __func__, rc);
                return rc;
        }
        
@@ -351,15 +351,14 @@ int nvram_read_partition(struct nvram_os_partition *part, char *buff,
                                        sizeof(struct err_log_info),
                                        &tmp_index);
                if (rc <= 0) {
-                       pr_err("%s: Failed nvram_read (%d)\n", __FUNCTION__,
-                                                                       rc);
+                       pr_err("%s: Failed nvram_read (%d)\n", __func__, rc);
                        return rc;
                }
        }
 
        rc = ppc_md.nvram_read(buff, length, &tmp_index);
        if (rc <= 0) {
-               pr_err("%s: Failed nvram_read (%d)\n", __FUNCTION__, rc);
+               pr_err("%s: Failed nvram_read (%d)\n", __func__, rc);
                return rc;
        }
 
@@ -869,7 +868,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
                break;
        default:
                pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n",
-                                               __FUNCTION__, (int) reason);
+                      __func__, (int) reason);
                return;
        }