From patchwork Wed May 20 19:32:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick X-Patchwork-Id: 6448661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E1F74C0432 for ; Wed, 20 May 2015 19:35:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F3242035D for ; Wed, 20 May 2015 19:35:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A4B2202EB for ; Wed, 20 May 2015 19:35:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yv9jg-0004ov-9L; Wed, 20 May 2015 19:33:00 +0000 Received: from mail-ig0-x236.google.com ([2607:f8b0:4001:c05::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yv9jb-0004ks-K5 for linux-arm-kernel@lists.infradead.org; Wed, 20 May 2015 19:32:56 +0000 Received: by igbyr2 with SMTP id yr2so111408193igb.0 for ; Wed, 20 May 2015 12:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=suq4fDJbO8Msz52aFCZPS5BmWCfQi6JA3dXsUBAF4Zs=; b=r+juxl2p3r1abXe2aH1dkmiuqcH+3rleEWr+jXfMFuMYGD1kB/npFO3YKbBzm4P4yk zgCnrVucBRUYOZ7zS/Ka37mN+IzPc0BckC1LLjvzwFgcD6X41voyVYtpSGJoZQPXsj+8 N0WWTnoruXfWEU7G6nNxLnj9VfPzW4M3NKOB3ES0Pwz0nwOMb2OdIW2aploeIfS7Tr2L xuYvc0KXsIHbQ6g6flOmnvlFjoxDZJX8uOugjodY64of9962MK1CsGy/Txlk4uJxbV5a GtJXHJjO5uqaBhUo5bnqD4RHVDbH3lbVfJNs5wsTA+KvpcJidnMsaeS3VXd5aStagGm6 en0A== X-Received: by 10.107.18.104 with SMTP id a101mr9580933ioj.51.1432150352190; Wed, 20 May 2015 12:32:32 -0700 (PDT) Received: from nick-System-Product-Name.hitronhub.home (CPEbc4dfb2691f3-CMbc4dfb2691f0.cpe.net.cable.rogers.com. [99.231.110.121]) by mx.google.com with ESMTPSA id f126sm13040949ioe.21.2015.05.20.12.32.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 May 2015 12:32:31 -0700 (PDT) From: Nicholas Krause To: tony@atomide.com Subject: [PATCH] mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c Date: Wed, 20 May 2015 15:32:26 -0400 Message-Id: <1432150346-31590-1-git-send-email-xerofoify@gmail.com> X-Mailer: git-send-email 2.1.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150520_123255_694270_2665764D X-CRM114-Status: GOOD ( 10.28 ) X-Spam-Score: -0.8 (/) Cc: linux-omap@vger.kernel.org, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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);