[PATCH 2/2] powerpc/nvram: Fix function name in some errors messages.

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups	linux.kernel
Subject	[PATCH 2/2] powerpc/nvram: Fix function name in some errors messages.
Date	Fri, 17 Jul 2015 09:30:01 +0200
Message-ID	<pN8fL-74a-9@gated-at.bofh.it> (permalink)
References	<pN8fL-74a-11@gated-at.bofh.it>
X-Original-To	benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au
X-Me-Helo	localhost.localdomain
X-Me-Auth	Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI=
X-Me-Date	Fri, 17 Jul 2015 09:20:12 +0200
X-Me-IP	92.140.160.103
X-Mailer	git-send-email 2.1.4
X-Antivirus	avast! (VPS 150716-3, 16/07/2015), Outbound message
X-Antivirus-Status	Clean
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	65
Organization	linux.* mail to news gateway
X-Original-Cc	linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr>
X-Original-Date	Fri, 17 Jul 2015 09:20:00 +0200
X-Original-Message-ID	<1571506ab2693a3128625c94f4f89dd802bb6dd2.1437117145.git.christophe.jaillet@wanadoo.fr>
X-Original-References	<4fd8daff1bb5daad99d909aa75ff5c2702c4c490.1437117145.git.christophe.jaillet@wanadoo.fr>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1186523

Show key headers only | View raw

'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>
---
 arch/powerpc/kernel/nvram_64.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 574ff59..4dab163 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -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;
 }
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 2/2] powerpc/nvram: Fix function name in some errors messages. Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2015-07-17 09:30 +0200

csiph-web