Commit aba6f4f2 authored by Joe Perches's avatar Joe Perches Committed by Benjamin Herrenschmidt

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent f83319d7
...@@ -298,13 +298,13 @@ int nvram_write_os_partition(struct nvram_os_partition *part, char * buff, ...@@ -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); rc = ppc_md.nvram_write((char *)&info, sizeof(struct err_log_info), &tmp_index);
if (rc <= 0) { 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; return rc;
} }
rc = ppc_md.nvram_write(buff, length, &tmp_index); rc = ppc_md.nvram_write(buff, length, &tmp_index);
if (rc <= 0) { 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; return rc;
} }
...@@ -351,15 +351,14 @@ int nvram_read_partition(struct nvram_os_partition *part, char *buff, ...@@ -351,15 +351,14 @@ int nvram_read_partition(struct nvram_os_partition *part, char *buff,
sizeof(struct err_log_info), sizeof(struct err_log_info),
&tmp_index); &tmp_index);
if (rc <= 0) { if (rc <= 0) {
pr_err("%s: Failed nvram_read (%d)\n", __FUNCTION__, pr_err("%s: Failed nvram_read (%d)\n", __func__, rc);
rc);
return rc; return rc;
} }
} }
rc = ppc_md.nvram_read(buff, length, &tmp_index); rc = ppc_md.nvram_read(buff, length, &tmp_index);
if (rc <= 0) { 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; return rc;
} }
...@@ -869,7 +868,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper, ...@@ -869,7 +868,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
break; break;
default: default:
pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n", pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n",
__FUNCTION__, (int) reason); __func__, (int) reason);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment