Skip to content

Commit

Permalink
net: fec: Convert to use devm_ioremap_resource
Browse files Browse the repository at this point in the history
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 <tushar.behera@linaro.org>
CC: netdev@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Tushar Behera authored and David S. Miller committed Jun 12, 2013
1 parent afd6eae commit 941e173
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/net/ethernet/freescale/fec_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1876,17 +1876,17 @@ fec_probe(struct platform_device *pdev)
(pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;

fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
fep->hwp = devm_ioremap_resource(&pdev->dev, r);
if (IS_ERR(fep->hwp)) {
ret = PTR_ERR(fep->hwp);
goto failed_ioremap;
}

fep->pdev = pdev;
fep->dev_id = dev_id++;

fep->bufdesc_ex = 0;

if (!fep->hwp) {
ret = -ENOMEM;
goto failed_ioremap;
}

platform_set_drvdata(pdev, ndev);

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

0 comments on commit 941e173

Please sign in to comment.