diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-10 17:05:07 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-12 02:22:35 -0700 |
| commit | 32766fff24a761079636bb96c389411d24a334c6 (patch) | |
| tree | faea1c2f25b77f64c9ef4d25f41ebb3b2e596feb /drivers/net/can/c_can | |
| parent | eed5d29d7818cc7a84e60123555cae154e5b4a73 (diff) | |
| download | talos-obmc-linux-32766fff24a761079636bb96c389411d24a334c6.tar.gz talos-obmc-linux-32766fff24a761079636bb96c389411d24a334c6.zip | |
net: can: Convert to use devm_ioremap_resource
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>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/c_can')
| -rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 4 |
1 files 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 6b6130b8bdc4..b918c7329426 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; |
