Commit b6080db4 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Michael Ellerman

powerpc/nvram: Fix function name in some errors messages.

'nvram_create_os_partition' should be 'nvram_create_partition'.
Use __func__ to have it right, as done elsewhere in this file.
Signed-off-by: default avatarChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 7d523187
...@@ -1065,7 +1065,7 @@ loff_t __init nvram_create_partition(const char *name, int sig, ...@@ -1065,7 +1065,7 @@ loff_t __init nvram_create_partition(const char *name, int sig,
/* Create our OS partition */ /* Create our OS partition */
new_part = kmalloc(sizeof(*new_part), GFP_KERNEL); new_part = kmalloc(sizeof(*new_part), GFP_KERNEL);
if (!new_part) { if (!new_part) {
pr_err("nvram_create_os_partition: kmalloc failed\n"); pr_err("%s: kmalloc failed\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1077,8 +1077,7 @@ loff_t __init nvram_create_partition(const char *name, int sig, ...@@ -1077,8 +1077,7 @@ loff_t __init nvram_create_partition(const char *name, int sig,
rc = nvram_write_header(new_part); rc = nvram_write_header(new_part);
if (rc <= 0) { if (rc <= 0) {
pr_err("nvram_create_os_partition: nvram_write_header " pr_err("%s: nvram_write_header failed (%d)\n", __func__, rc);
"failed (%d)\n", rc);
kfree(new_part); kfree(new_part);
return rc; return rc;
} }
...@@ -1091,8 +1090,8 @@ loff_t __init nvram_create_partition(const char *name, int sig, ...@@ -1091,8 +1090,8 @@ loff_t __init nvram_create_partition(const char *name, int sig,
free_part->header.checksum = nvram_checksum(&free_part->header); free_part->header.checksum = nvram_checksum(&free_part->header);
rc = nvram_write_header(free_part); rc = nvram_write_header(free_part);
if (rc <= 0) { if (rc <= 0) {
pr_err("nvram_create_os_partition: nvram_write_header " pr_err("%s: nvram_write_header failed (%d)\n",
"failed (%d)\n", rc); __func__, rc);
return rc; return rc;
} }
} else { } else {
...@@ -1106,11 +1105,12 @@ loff_t __init nvram_create_partition(const char *name, int sig, ...@@ -1106,11 +1105,12 @@ loff_t __init nvram_create_partition(const char *name, int sig,
tmp_index += NVRAM_BLOCK_LEN) { tmp_index += NVRAM_BLOCK_LEN) {
rc = ppc_md.nvram_write(nv_init_vals, NVRAM_BLOCK_LEN, &tmp_index); rc = ppc_md.nvram_write(nv_init_vals, NVRAM_BLOCK_LEN, &tmp_index);
if (rc <= 0) { if (rc <= 0) {
pr_err("nvram_create_partition: nvram_write failed (%d)\n", rc); pr_err("%s: nvram_write failed (%d)\n",
__func__, rc);
return rc; return rc;
} }
} }
return new_part->index + NVRAM_HEADER_LEN; return new_part->index + NVRAM_HEADER_LEN;
} }
......
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