From patchwork Sun May 10 04:57:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick X-Patchwork-Id: 6370861 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 91F40BEEE1 for ; Sun, 10 May 2015 05:01:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C92520389 for ; Sun, 10 May 2015 05:01:55 +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 59E8320384 for ; Sun, 10 May 2015 05:01:54 +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 1YrJJU-0001MR-Nu; Sun, 10 May 2015 04:58:04 +0000 Received: from mail-ig0-x235.google.com ([2607:f8b0:4001:c05::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YrJJR-0001Lr-7T for linux-arm-kernel@lists.infradead.org; Sun, 10 May 2015 04:58:01 +0000 Received: by igbpi8 with SMTP id pi8so53382938igb.0 for ; Sat, 09 May 2015 21:57:39 -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=ci6T3JoISFsXGes9b3eVTyUwAljhZw9ZL/fo4Y8V0WQ=; b=MxHS9oB8KSiIzb8sWi6n0X4bEcu6BGYsHdPILboygArtf4sORADmqAr0UlikM+Fjhm xNf8XZl7a61XX4zg2s5EBk6XGG0fs3mx8+M2m+bb/Mu1Q/iXf6skNswjrEXCtWCjca1n 28yHLFXLycW4+BX7oe+219EOwDV+AEe89DA7uRRARsE4y/+PQYB6/fLw1sErvChH7IIf QT14bc30JJZwJU9htdIm5LyMBElGDcrnmsxINKZd7UKtR7pf9YhkZ8zh0VgrfAo2oD8w gPHg9BqiLZUhcBZ4SSKRdi2bQ7m6FB/PUwG1CAtbCACyjPl4fp/o7FYJZJiyevjOACef 7+Tw== X-Received: by 10.50.29.40 with SMTP id g8mr7554783igh.41.1431233859627; Sat, 09 May 2015 21:57:39 -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 n9sm3190915igy.2.2015.05.09.21.57.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 09 May 2015 21:57:38 -0700 (PDT) From: Nicholas Krause To: tony@atomide.com Subject: [PATCH] mach-omap2:Remove calls to deprecacted marco, PTR_RET in the files, fb.c and pmu.c Date: Sun, 10 May 2015 00:57:34 -0400 Message-Id: <1431233854-31982-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-20150509_215801_342136_34E407EC X-CRM114-Status: GOOD ( 11.40 ) X-Spam-Score: -0.8 (/) Cc: khilman@deeprootsystems.com, 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 two calls to the deprecated marco,PTR_RET in the files,fb.c and pmu.c for the functions,omap_init_vrfb and omap_init_pmu respectfully. Furthermore these are now replaced by calling the correctly non deprecacted function, PTR_ERR_OR_ZERO in both functions. Signed-off-by: Nicholas Krause --- arch/arm/mach-omap2/fb.c | 2 +- arch/arm/mach-omap2/pmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c index 26e28e9..1f1ecf8 100644 --- a/arch/arm/mach-omap2/fb.c +++ b/arch/arm/mach-omap2/fb.c @@ -84,7 +84,7 @@ int __init omap_init_vrfb(void) pdev = platform_device_register_resndata(NULL, "omapvrfb", -1, res, num_res, NULL, 0); - return PTR_RET(pdev); + return PTR_ERR_OR_ZERO(pdev); } #else int __init omap_init_vrfb(void) { return 0; } diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c index a69e9a3..d2adfeb 100644 --- a/arch/arm/mach-omap2/pmu.c +++ b/arch/arm/mach-omap2/pmu.c @@ -55,7 +55,7 @@ static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[]) WARN(IS_ERR(omap_pmu_dev), "Can't build omap_device for %s.\n", dev_name); - return PTR_RET(omap_pmu_dev); + return PTR_ERR_OR_ZERO(omap_pmu_dev); } static int __init omap_init_pmu(void)