diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-05-13 23:15:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-14 15:42:07 -0400 |
commit | 126e612223c885a8718839d97c67473503bea58a (patch) | |
tree | 681288db60c5c7c932bc51005f594515e31144f6 | |
parent | 005e35f5f0783925428a78bb2b21ae92f3514e9c (diff) |
net: systemport: Use devm_ioremap_resource()
Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 56b74a495181..f66de1344b6e 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c | |||
@@ -1514,10 +1514,9 @@ static int bcm_sysport_probe(struct platform_device *pdev) | |||
1514 | goto err; | 1514 | goto err; |
1515 | } | 1515 | } |
1516 | 1516 | ||
1517 | priv->base = devm_request_and_ioremap(&pdev->dev, r); | 1517 | priv->base = devm_ioremap_resource(&pdev->dev, r); |
1518 | if (!priv->base) { | 1518 | if (IS_ERR(priv->base)) { |
1519 | dev_err(&pdev->dev, "register remap failed\n"); | 1519 | ret = PTR_ERR(priv->base); |
1520 | ret = -ENOMEM; | ||
1521 | goto err; | 1520 | goto err; |
1522 | } | 1521 | } |
1523 | 1522 | ||