From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH] mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c Date: Wed, 20 May 2015 13:55:03 -0700 Message-ID: <20150520205503.GN10274@atomide.com> References: <1432150346-31590-1-git-send-email-xerofoify@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from muru.com ([72.249.23.125]:52625 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753731AbbETUzG (ORCPT ); Wed, 20 May 2015 16:55:06 -0400 Content-Disposition: inline In-Reply-To: <1432150346-31590-1-git-send-email-xerofoify@gmail.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Nicholas Krause Cc: linux@arm.linux.org.uk, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org * Nicholas Krause [150520 12:33]: > This removes the deprecacted marco, PTR_RET and changes the > functions that use this marco in their return statement to > instead use the non deprecacted function, PTR_ERR_OR_ZERO > for the file devices.c. > > Signed-off-by: Nicholas Krause Applying into omap-for-v4.2/cleanup thanks. Tony > --- > arch/arm/mach-omap2/devices.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index 990338f..a69bd67 100644 > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c > @@ -63,7 +63,7 @@ static int __init omap3_l3_init(void) > > WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); > > - return PTR_RET(pdev); > + return PTR_ERR_OR_ZERO(pdev); > } > omap_postcore_initcall(omap3_l3_init); > > @@ -333,6 +333,6 @@ static int __init omap_gpmc_init(void) > pdev = omap_device_build("omap-gpmc", -1, oh, NULL, 0); > WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); > > - return PTR_RET(pdev); > + return PTR_ERR_OR_ZERO(pdev); > } > omap_postcore_initcall(omap_gpmc_init); > -- > 2.1.4 >