Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Christophe Jaillet and committed by
Michael Ellerman
b6080db4 7d523187

+7 -7
+7 -7
arch/powerpc/kernel/nvram_64.c
··· 1065 1065 /* Create our OS partition */ 1066 1066 new_part = kmalloc(sizeof(*new_part), GFP_KERNEL); 1067 1067 if (!new_part) { 1068 - pr_err("nvram_create_os_partition: kmalloc failed\n"); 1068 + pr_err("%s: kmalloc failed\n", __func__); 1069 1069 return -ENOMEM; 1070 1070 } 1071 1071 ··· 1077 1077 1078 1078 rc = nvram_write_header(new_part); 1079 1079 if (rc <= 0) { 1080 - pr_err("nvram_create_os_partition: nvram_write_header " 1081 - "failed (%d)\n", rc); 1080 + pr_err("%s: nvram_write_header failed (%d)\n", __func__, rc); 1082 1081 kfree(new_part); 1083 1082 return rc; 1084 1083 } ··· 1090 1091 free_part->header.checksum = nvram_checksum(&free_part->header); 1091 1092 rc = nvram_write_header(free_part); 1092 1093 if (rc <= 0) { 1093 - pr_err("nvram_create_os_partition: nvram_write_header " 1094 - "failed (%d)\n", rc); 1094 + pr_err("%s: nvram_write_header failed (%d)\n", 1095 + __func__, rc); 1095 1096 return rc; 1096 1097 } 1097 1098 } else { ··· 1105 1106 tmp_index += NVRAM_BLOCK_LEN) { 1106 1107 rc = ppc_md.nvram_write(nv_init_vals, NVRAM_BLOCK_LEN, &tmp_index); 1107 1108 if (rc <= 0) { 1108 - pr_err("nvram_create_partition: nvram_write failed (%d)\n", rc); 1109 + pr_err("%s: nvram_write failed (%d)\n", 1110 + __func__, rc); 1109 1111 return rc; 1110 1112 } 1111 1113 } 1112 - 1114 + 1113 1115 return new_part->index + NVRAM_HEADER_LEN; 1114 1116 } 1115 1117