From d3a22442307a37225d99a5137fcbd9fbb2f5c343 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Fri, 4 Jul 2014 21:03:10 +0200 Subject: ARM: imx: use PTR_ERR_OR_ZERO replace IS_ERR/PTR_ERR Cc: Sascha Hauer Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Fabian Frederick Signed-off-by: Shawn Guo --- arch/arm/mach-imx/mx31moboard-marxbot.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm/mach-imx/mx31moboard-marxbot.c') diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c index 699d01a4fef8..2e895a82a6eb 100644 --- a/arch/arm/mach-imx/mx31moboard-marxbot.c +++ b/arch/arm/mach-imx/mx31moboard-marxbot.c @@ -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 = { -- cgit