linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tushar Behera <tushar.behera@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: thierry.reding@gmail.com, patches@linaro.org,
	netdev@vger.kernel.org, linux-can@vger.kernel.org,
	Marc Kleine-Budde <mkl@pengutronix.de>,
	Wolfgang Grandegger <wg@grandegger.com>
Subject: [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
Date: Mon, 10 Jun 2013 17:05:07 +0530	[thread overview]
Message-ID: <1370864113-17895-10-git-send-email-tushar.behera@linaro.org> (raw)
In-Reply-To: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org>

Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: netdev@vger.kernel.org
CC: linux-can@vger.kernel.org
CC: Marc Kleine-Budde <mkl@pengutronix.de>
CC: Wolfgang Grandegger <wg@grandegger.com>
---
 drivers/net/can/c_can/c_can_platform.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 6b6130b..b918c73 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -201,8 +201,8 @@ static int c_can_plat_probe(struct platform_device *pdev)
 			priv->instance = pdev->id;
 
 		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-		priv->raminit_ctrlreg =	devm_request_and_ioremap(&pdev->dev, res);
-		if (!priv->raminit_ctrlreg || priv->instance < 0)
+		priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);
+		if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
 			dev_info(&pdev->dev, "control memory is not used for raminit\n");
 		else
 			priv->raminit = c_can_hw_raminit;
-- 
1.7.9.5


  parent reply	other threads:[~2013-06-10 11:50 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-10 11:34 [PATCH 00/15] Convert to use devm_ioremap_resource Tushar Behera
2013-06-10 11:34 ` [PATCH 01/15] sparc,leon: " Tushar Behera
2013-06-10 12:03   ` Sachin Kamat
2013-06-11  3:07     ` Tushar Behera
2013-06-17  9:07   ` [PATCH V2 1/15] " Tushar Behera
2013-06-19  9:14     ` David Miller
2013-06-10 11:35 ` [PATCH 02/15] sudmac: " Tushar Behera
2013-06-17  6:11   ` Tushar Behera
2013-06-10 11:35 ` [PATCH 03/15] mmc: mvsdio: " Tushar Behera
2013-06-17  6:12   ` Tushar Behera
2013-06-10 11:35 ` [PATCH 04/15] gpio_msm: " Tushar Behera
2013-06-17  6:13   ` Tushar Behera
2013-06-10 11:35 ` [PATCH 05/15] gpio-sta2x11: " Tushar Behera
2013-06-17  6:13   ` Tushar Behera
2013-06-17  8:54   ` Linus Walleij
2013-06-10 11:35 ` [PATCH 06/15] net: bcm63xx_enet: " Tushar Behera
2013-06-12  9:23   ` David Miller
2013-06-10 11:35 ` [PATCH 07/15] net: fec: " Tushar Behera
2013-06-12  9:23   ` David Miller
2013-06-10 11:35 ` [PATCH 08/15] net: emaclite: " Tushar Behera
2013-06-12  9:23   ` David Miller
2013-06-10 11:35 ` Tushar Behera [this message]
2013-06-10 13:09   ` [PATCH 09/15] net: can: " Marc Kleine-Budde
2013-06-11  3:15     ` Tushar Behera
2013-06-12  3:09       ` 'Greg Kroah-Hartman'
2013-06-12  9:23   ` David Miller
2013-06-13  5:30   ` Tushar Behera
2013-06-13  5:41     ` Sachin Kamat
2013-06-10 11:35 ` [PATCH 10/15] Staging: netlogic: " Tushar Behera
2013-06-10 11:35 ` [PATCH 11/15] regulator: ti-abb: " Tushar Behera
2013-06-10 12:01   ` Sachin Kamat
2013-06-11  4:31     ` Tushar Behera
2013-06-17  9:12   ` Tushar Behera
2013-06-17 10:05     ` Mark Brown
2013-06-17 10:34       ` Tushar Behera
2013-06-17 16:08         ` Mark Brown
2013-06-17 19:45           ` Thierry Reding
2013-06-18  4:15   ` [PATCH V2 " Tushar Behera
2013-06-18 11:59     ` Mark Brown
2013-06-10 11:35 ` [PATCH 12/15] ASoC: spear: " Tushar Behera
2013-06-10 12:06   ` Sachin Kamat
2013-06-11  3:51     ` Tushar Behera
2013-06-17  9:13   ` [PATCH V2 " Tushar Behera
2013-06-17 10:20     ` Mark Brown
2013-06-17 10:40       ` [PATCH V3 " Tushar Behera
2013-06-17 16:20         ` Mark Brown
2013-06-10 11:35 ` [PATCH 13/15] pci: mvebu: " Tushar Behera
2013-06-10 14:29   ` Sachin Kamat
2013-06-11  4:51     ` Tushar Behera
2013-06-17  9:16   ` [PATCH V2 6/6] " Tushar Behera
2013-07-23 18:38     ` Bjorn Helgaas
2013-07-23 20:19       ` Ezequiel Garcia
2013-08-06 10:39       ` Thomas Petazzoni
2013-08-06 18:10         ` Bjorn Helgaas
2013-06-10 11:35 ` [PATCH 14/15] usb: phy: rcar-usb: Fix comment w.r.t. devm_ioremap_resource Tushar Behera
2013-06-10 12:17   ` Sergei Shtylyov
2013-06-11  3:21     ` Tushar Behera
2013-06-10 11:35 ` [PATCH 15/15] lib: devres: Remove deprecated devm_request_and_ioremap Tushar Behera
2013-06-12 12:43   ` Andy Shevchenko
2013-06-12 17:39     ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370864113-17895-10-git-send-email-tushar.behera@linaro.org \
    --to=tushar.behera@linaro.org \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    --cc=patches@linaro.org \
    --cc=thierry.reding@gmail.com \
    --cc=wg@grandegger.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).