From patchwork Mon Mar 11 23:18:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2251891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 69FC9DF5B1 for ; Mon, 11 Mar 2013 23:22:05 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFBzF-0000eV-ET; Mon, 11 Mar 2013 23:18:33 +0000 Received: from mail-ye0-f175.google.com ([209.85.213.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFBzB-0000e0-Ps for linux-arm-kernel@lists.infradead.org; Mon, 11 Mar 2013 23:18:30 +0000 Received: by mail-ye0-f175.google.com with SMTP id j12so726149yeg.6 for ; Mon, 11 Mar 2013 16:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=2zKcCr6My6Es5AGh7mtJbJ8v6QEWQesJzfNDmV4xlzc=; b=DaTI+0q+2P/q4I9vZXGMmsxngJp7ZQ17cxZuk/NaoUt7d4jMpyOgiATkFIRVHVHnkk E7Hk5Q45oICjj6GXvHI1CGHa6FJ3BP9KUKcPqGBabHOYw3RrGxXSYaS6C2CBI5Txyqf+ PV7YGIi4A09PIAXaKIUiMSmh6+JwY6ZFPjfRpTbf4ckFNQ7OvPefkesCN7KdCRj3ah2Y gqjMzT2QRRHgOh+RXlTUwLd0S3239/Q5tVW4wN7NxMJ6H4oAJZ74SQ3M3sjFe9e40LRu A0pmQ55pCUTMRBXvRS774kQR/jrcTJCbw4f5AGga5dI6yKKpxyUaA9HDfEkA+fFcQDVU 1nSQ== X-Received: by 10.236.182.69 with SMTP id n45mr10860733yhm.170.1363043908178; Mon, 11 Mar 2013 16:18:28 -0700 (PDT) Received: from localhost.localdomain ([201.82.138.249]) by mx.google.com with ESMTPS id n2sm26609748yhm.1.2013.03.11.16.18.25 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 11 Mar 2013 16:18:27 -0700 (PDT) From: Fabio Estevam To: zbr@ioremap.net Subject: [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource() Date: Mon, 11 Mar 2013 20:18:15 -0300 Message-Id: <1363043896-16140-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130311_191829_905049_8A897AFD X-CRM114-Status: UNSURE ( 9.98 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.175 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Fabio Estevam , gregkh@linuxfoundation.org, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 From: Fabio Estevam According to Documentation/driver-model/devres.txt: devm_request_and_ioremap() : obsoleted by devm_ioremap_resource() Signed-off-by: Fabio Estevam --- drivers/w1/masters/mxc_w1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 950d354..47e12cf 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -121,9 +121,9 @@ static int mxc_w1_probe(struct platform_device *pdev) mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - mdev->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!mdev->regs) - return -EBUSY; + mdev->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(mdev->regs)) + return PTR_ERR(mdev->regs); clk_prepare_enable(mdev->clk); __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);