diff options
author | Joe Perches <joe@perches.com> | 2014-03-25 15:35:03 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-04-08 22:53:32 -0400 |
commit | aba6f4f2e64f9b43aaba6d46c67e9e25a55f4614 (patch) | |
tree | 4510f92a367fbcb3c6313d6e5bc165bdaced8ef9 /arch/powerpc | |
parent | f83319d71002aec03bd87bc9aabce5f549680f0a (diff) |
powerpc: Convert last uses of __FUNCTION__ to __func__
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/pseries/nvram.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c index d7096f2f7751..0cc240b7f694 100644 --- a/arch/powerpc/platforms/pseries/nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c | |||
@@ -298,13 +298,13 @@ int nvram_write_os_partition(struct nvram_os_partition *part, char * buff, | |||
298 | 298 | ||
299 | rc = ppc_md.nvram_write((char *)&info, sizeof(struct err_log_info), &tmp_index); | 299 | rc = ppc_md.nvram_write((char *)&info, sizeof(struct err_log_info), &tmp_index); |
300 | if (rc <= 0) { | 300 | if (rc <= 0) { |
301 | pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc); | 301 | pr_err("%s: Failed nvram_write (%d)\n", __func__, rc); |
302 | return rc; | 302 | return rc; |
303 | } | 303 | } |
304 | 304 | ||
305 | rc = ppc_md.nvram_write(buff, length, &tmp_index); | 305 | rc = ppc_md.nvram_write(buff, length, &tmp_index); |
306 | if (rc <= 0) { | 306 | if (rc <= 0) { |
307 | pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc); | 307 | pr_err("%s: Failed nvram_write (%d)\n", __func__, rc); |
308 | return rc; | 308 | return rc; |
309 | } | 309 | } |
310 | 310 | ||
@@ -351,15 +351,14 @@ int nvram_read_partition(struct nvram_os_partition *part, char *buff, | |||
351 | sizeof(struct err_log_info), | 351 | sizeof(struct err_log_info), |
352 | &tmp_index); | 352 | &tmp_index); |
353 | if (rc <= 0) { | 353 | if (rc <= 0) { |
354 | pr_err("%s: Failed nvram_read (%d)\n", __FUNCTION__, | 354 | pr_err("%s: Failed nvram_read (%d)\n", __func__, rc); |
355 | rc); | ||
356 | return rc; | 355 | return rc; |
357 | } | 356 | } |
358 | } | 357 | } |
359 | 358 | ||
360 | rc = ppc_md.nvram_read(buff, length, &tmp_index); | 359 | rc = ppc_md.nvram_read(buff, length, &tmp_index); |
361 | if (rc <= 0) { | 360 | if (rc <= 0) { |
362 | pr_err("%s: Failed nvram_read (%d)\n", __FUNCTION__, rc); | 361 | pr_err("%s: Failed nvram_read (%d)\n", __func__, rc); |
363 | return rc; | 362 | return rc; |
364 | } | 363 | } |
365 | 364 | ||
@@ -869,7 +868,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper, | |||
869 | break; | 868 | break; |
870 | default: | 869 | default: |
871 | pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n", | 870 | pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n", |
872 | __FUNCTION__, (int) reason); | 871 | __func__, (int) reason); |
873 | return; | 872 | return; |
874 | } | 873 | } |
875 | 874 | ||