Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a22442 authored by Fabian Frederick's avatar Fabian Frederick Committed by Shawn Guo
Browse files

ARM: imx: use PTR_ERR_OR_ZERO 



replace IS_ERR/PTR_ERR

Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 26651c43

arch/arm/mach-imx/devices/platform-mxc_rnga.c

+1 −4
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ static int __init imxXX_add_mxc_rnga(void) 
#endif /* if defined(CONFIG_SOC_IMX31) */

		ret = ERR_PTR(-ENODEV);



	if (IS_ERR(ret))

		return PTR_ERR(ret);



	return 0;

	return PTR_ERR_OR_ZERO(ret);

}

arch_initcall(imxXX_add_mxc_rnga);

arch/arm/mach-imx/mach-mx31moboard.c

+1 −3
Original line number Diff line number Diff line
@@ -435,10 +435,8 @@ 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 = {

arch/arm/mach-imx/mx31moboard-devboard.c

+1 −3
Original line number Diff line number Diff line
@@ -214,10 +214,8 @@ static int __init devboard_usbh1_init(void) 
	usbh1_pdata.otg = phy;



	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	return 0;

	return PTR_ERR_OR_ZERO(pdev);

}

arch/arm/mach-imx/mx31moboard-marxbot.c

+1 −3
Original line number Diff line number Diff line
@@ -328,10 +328,8 @@ static int __init marxbot_usbh1_init(void) 
	usbh1_pdata.otg = phy;



	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	return 0;

	return PTR_ERR_OR_ZERO(pdev);

}



static const struct fsl_usb2_platform_data usb_pdata __initconst = {

arch/arm/mach-imx/mx31moboard-smartbot.c

+1 −3
Original line number Diff line number Diff line
@@ -142,10 +142,8 @@ static int __init smartbot_otg_host_init(void) 
		return -ENODEV;



	pdev = imx31_add_mxc_ehci_otg(&otg_host_pdata);

	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	return 0;

	return PTR_ERR_OR_ZERO(pdev);

}

#else

static inline int smartbot_otg_host_init(void) { return 0; }