linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][V2] powerpc/fadump: trivial fix of spelling mistake, clean up message
@ 2016-06-27 11:07 Colin King
  2016-06-30 12:36 ` [V2] " Michael Ellerman
  2016-07-01  2:31 ` [PATCH] powerpc/fadump: Fix compile error due to missing semicolon Ian Munsie
  0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2016-06-27 11:07 UTC (permalink / raw)
  To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Jiri Kosina, Rasmus Villemoes, Andrew Morton, linuxppc-dev
  Cc: linux-kernel

From: Colin Ian King <colin.king@canonical.com>

Fix trivial spelling mistake "rgistration". Also use pr_err
instead of printk and unsplit the string to keep it all on one
line.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arch/powerpc/kernel/fadump.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 3cb3b02a..09cb2a7 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -1009,9 +1009,9 @@ static int fadump_invalidate_dump(struct fadump_mem_struct *fdm)
 	} while (wait_time);
 
 	if (rc) {
-		printk(KERN_ERR "Failed to invalidate firmware-assisted dump "
-			"rgistration. unexpected error(%d).\n", rc);
-		return rc;
+		pr_err("Failed to invalidate firmware-assisted dump registration. Unexpected error (%d).\n",
+		       rc);
+		return rc
 	}
 	fw_dump.dump_active = 0;
 	fdm_active = NULL;
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [V2] powerpc/fadump: trivial fix of spelling mistake, clean up message
  2016-06-27 11:07 [PATCH][V2] powerpc/fadump: trivial fix of spelling mistake, clean up message Colin King
@ 2016-06-30 12:36 ` Michael Ellerman
  2016-07-01  2:31 ` [PATCH] powerpc/fadump: Fix compile error due to missing semicolon Ian Munsie
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Ellerman @ 2016-06-30 12:36 UTC (permalink / raw)
  To: Colin King, Benjamin Herrenschmidt, Paul Mackerras, Jiri Kosina,
	Rasmus Villemoes, Andrew Morton, linuxppc-dev
  Cc: linux-kernel

On Mon, 2016-27-06 at 11:07:41 UTC, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Fix trivial spelling mistake "rgistration". Also use pr_err
> instead of printk and unsplit the string to keep it all on one
> line.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/4a03749f140cbee6fee66b674b

cheers

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] powerpc/fadump: Fix compile error due to missing semicolon
  2016-06-27 11:07 [PATCH][V2] powerpc/fadump: trivial fix of spelling mistake, clean up message Colin King
  2016-06-30 12:36 ` [V2] " Michael Ellerman
@ 2016-07-01  2:31 ` Ian Munsie
  1 sibling, 0 replies; 3+ messages in thread
From: Ian Munsie @ 2016-07-01  2:31 UTC (permalink / raw)
  To: Michael Ellerman, linuxppc-dev, Huy Nguyen; +Cc: Ian Munsie

From: Ian Munsie <imunsie@au1.ibm.com>

The commit "powerpc/fadump: trivial fix of spelling mistake, clean up
message" removed a semicolon causing the following compile failure:

arch/powerpc/kernel/fadump.c: In function ‘fadump_invalidate_dump’:
arch/powerpc/kernel/fadump.c:1014:2: error: expected ‘;’ before ‘}’ token
  }
  ^

Reported-by: Huy Nguyen <huyn@mellanox.com>
Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
---
 arch/powerpc/kernel/fadump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index f066486..b3a6633 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -1010,7 +1010,7 @@ static int fadump_invalidate_dump(struct fadump_mem_struct *fdm)
 
 	if (rc) {
 		pr_err("Failed to invalidate firmware-assisted dump registration. Unexpected error (%d).\n", rc);
-		return rc
+		return rc;
 	}
 	fw_dump.dump_active = 0;
 	fdm_active = NULL;
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-07-01  2:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-27 11:07 [PATCH][V2] powerpc/fadump: trivial fix of spelling mistake, clean up message Colin King
2016-06-30 12:36 ` [V2] " Michael Ellerman
2016-07-01  2:31 ` [PATCH] powerpc/fadump: Fix compile error due to missing semicolon Ian Munsie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).