2014-04-11 08:40:55

by Duan Jiong

Subject: [PATCH] serial: imx: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO

This patch fixes coccinelle error regarding usage of IS_ERR and
PTR_ERR instead of PTR_ERR_OR_ZERO.

Signed-off-by: Duan Jiong <[email protected]>
---
arch/arm/mach-imx/mach-mx31moboard.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 8f45afe..c05d711 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -434,10 +434,7 @@ static int __init moboard_usbh2_init(void)
return -ENODEV;

pdev = imx31_add_mxc_ehci_hs(2, &usbh2_pdata);
- if (IS_ERR(pdev))
- return PTR_ERR(pdev);
-
- return 0;
+ return PTR_ERR_OR_ZERO(pdev);
}

static const struct gpio_led mx31moboard_leds[] __initconst = {
--
1.8.3.1

2014-04-13 08:00:46

by Shawn Guo

Subject: Re: [PATCH] serial: imx: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO

On Fri, Apr 11, 2014 at 04:38:42PM +0800, Duan Jiong wrote:
> This patch fixes coccinelle error regarding usage of IS_ERR and
> PTR_ERR instead of PTR_ERR_OR_ZERO.
>
> Signed-off-by: Duan Jiong <[email protected]>
> ---
> arch/arm/mach-imx/mach-mx31moboard.c | 5 +----

You are patching a board file under arch/arm/mach-imx, but have the
patch prefixed with "serial:". This is quite confusing.

You may want to just merge the change into the one you sent to change
mx31moboard-smartbot.c.

Shawn

> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
> index 8f45afe..c05d711 100644
> --- a/arch/arm/mach-imx/mach-mx31moboard.c
> +++ b/arch/arm/mach-imx/mach-mx31moboard.c
> @@ -434,10 +434,7 @@ static int __init moboard_usbh2_init(void)
> return -ENODEV;
>
> pdev = imx31_add_mxc_ehci_hs(2, &usbh2_pdata);
> - if (IS_ERR(pdev))
> - return PTR_ERR(pdev);
> -
> - return 0;
> + return PTR_ERR_OR_ZERO(pdev);
> }
>
> static const struct gpio_led mx31moboard_leds[] __initconst = {
> --
> 1.8.3.1
>
>
>