net: can: Convert to use devm_ioremap_resource

[deliverable/linux.git] / drivers / net / can / c_can / c_can_platform.c

diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 6b6130b8bdc4c3d58489e1b920fc6d81c6ad0454..b918c73294265fdcf56737d20c6761cefd82874e 100644 (file)
--- 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;