From: Thomas Meyer <thomas@m3y3r.de>
Date: Mon, 6 Aug 2012 17:51:16 +0000 (+0200)
Subject: m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e786f6bfd62e4da8c07c8e208a881c2b855a534a;p=deliverable%2Flinux.git

m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR

The semantic patch that makes this change is available
in scripts/coccinelle/api/ptr_ret.cocci.

More information about semantic patching is available at
http://coccinelle.lip6.fr/

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 8a1ce327c963..1adb5b7b0d1a 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(void)
 		return -ENODEV;
 
 	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
-	if (IS_ERR(pdev))
-		return PTR_ERR(pdev);
-
-	return 0;
+	return PTR_RET(pdev);
 }
 arch_initcall(q40_add_kbd_device);