powerpc/nvram: Fix function name in some errors messages.
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Fri, 17 Jul 2015 07:20:00 +0000 (09:20 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 2 Oct 2015 12:55:05 +0000 (22:55 +1000)
'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>
arch/powerpc/kernel/nvram_64.c

index 72858e926e0a97d40cd7b1b5da1627fd8a38ff54..32e26526f7e4e0fc5d22adda109bb075a044ae70 100644 (file)
@@ -1065,7 +1065,7 @@ loff_t __init nvram_create_partition(const char *name, int sig,
        /* Create our OS partition */
        new_part = kmalloc(sizeof(*new_part), GFP_KERNEL);
        if (!new_part) {
-               pr_err("nvram_create_os_partition: kmalloc failed\n");
+               pr_err("%s: kmalloc failed\n", __func__);
                return -ENOMEM;
        }
 
@@ -1077,8 +1077,7 @@ loff_t __init nvram_create_partition(const char *name, int sig,
 
        rc = nvram_write_header(new_part);
        if (rc <= 0) {
-               pr_err("nvram_create_os_partition: nvram_write_header "
-                      "failed (%d)\n", rc);
+               pr_err("%s: nvram_write_header failed (%d)\n", __func__, rc);
                kfree(new_part);
                return rc;
        }
@@ -1091,8 +1090,8 @@ loff_t __init nvram_create_partition(const char *name, int sig,
                free_part->header.checksum = nvram_checksum(&free_part->header);
                rc = nvram_write_header(free_part);
                if (rc <= 0) {
-                       pr_err("nvram_create_os_partition: nvram_write_header "
-                              "failed (%d)\n", rc);
+                       pr_err("%s: nvram_write_header failed (%d)\n",
+                              __func__, rc);
                        return rc;
                }
        } else {
@@ -1106,11 +1105,12 @@ loff_t __init nvram_create_partition(const char *name, int sig,
             tmp_index += NVRAM_BLOCK_LEN) {
                rc = ppc_md.nvram_write(nv_init_vals, NVRAM_BLOCK_LEN, &tmp_index);
                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 new_part->index + NVRAM_HEADER_LEN;
 }