Skip to content

Commit 941e173

Browse files
trbeheradavem330
authored andcommitted
net: fec: 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: "David S. Miller" <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent afd6eae commit 941e173

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/net/ethernet/freescale/fec_main.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1876,17 +1876,17 @@ fec_probe(struct platform_device *pdev)
18761876
(pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
18771877
fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
18781878

1879-
fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
1879+
fep->hwp = devm_ioremap_resource(&pdev->dev, r);
1880+
if (IS_ERR(fep->hwp)) {
1881+
ret = PTR_ERR(fep->hwp);
1882+
goto failed_ioremap;
1883+
}
1884+
18801885
fep->pdev = pdev;
18811886
fep->dev_id = dev_id++;
18821887

18831888
fep->bufdesc_ex = 0;
18841889

1885-
if (!fep->hwp) {
1886-
ret = -ENOMEM;
1887-
goto failed_ioremap;
1888-
}
1889-
18901890
platform_set_drvdata(pdev, ndev);
18911891

18921892
ret = of_get_phy_mode(pdev->dev.of_node);

0 commit comments

Comments
 (0)