Skip to content

Commit 32766ff

Browse files
trbeheradavem330
authored andcommitted
net: can: Convert to use devm_ioremap_resource
Commit 7509657 ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap(). Signed-off-by: Tushar Behera <[email protected]> CC: [email protected] CC: [email protected] CC: Marc Kleine-Budde <[email protected]> CC: Wolfgang Grandegger <[email protected]> Acked-by: Marc Kleine-Budde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent eed5d29 commit 32766ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/can/c_can/c_can_platform.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ static int c_can_plat_probe(struct platform_device *pdev)
201201
priv->instance = pdev->id;
202202

203203
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
204-
priv->raminit_ctrlreg = devm_request_and_ioremap(&pdev->dev, res);
205-
if (!priv->raminit_ctrlreg || priv->instance < 0)
204+
priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);
205+
if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
206206
dev_info(&pdev->dev, "control memory is not used for raminit\n");
207207
else
208208
priv->raminit = c_can_hw_raminit;

0 commit comments

Comments
 (0)