m68k: Use PTR_RET rather than if(IS_ERR(.. [2]

PATCH Applied Thomas Meyer 2 participants 3 messages Aug 6, 2012 – Aug 18, 2012 m68k architecture

lore

Share & tools

lore

Thomas Meyer

author

2012-08-06 18:31 UTC #0 lore raw

PATCH 1/1 m68k: Use PTR_RET rather than if(IS_ERR(.. [2]

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 <[email protected]>

---

arch/m68k/q40/config.c +1 -4

diff -u -p a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
@@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(voi
 		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);

Geert Uytterhoeven

maintainer Applied

2012-08-18 13:20 UTC #1 lore raw

Thanks, applied and queued for 3.7.

Quoted 13 lines · Thomas Meyer

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 <[email protected]>
---
diff -u -p a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c

arch/m68k/q40/config.c static __init int q40_add_kbd_device(voi · line 343

Quoted 10 lines

arch/m68k/q40/config.c +1 -4

@@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(voi
                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);

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Geert Uytterhoeven

maintainer Applied

2012-08-18 13:20 UTC #2 lore raw

In reply to Thomas Meyer

Thanks, applied and queued for 3.7.

Quoted 13 lines · Thomas Meyer

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 <[email protected]>
---
diff -u -p a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c

arch/m68k/q40/config.c static __init int q40_add_kbd_device(voi · line 343

Quoted 10 lines

arch/m68k/q40/config.c +1 -4

@@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(voi
                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);

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds