diff options
| author |   Jingoo Han <jg1.han@samsung.com> | 2014-05-14 12:15:42 +0900 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-05-14 15:42:07 -0400 |
| commit | 126e612223c885a8718839d97c67473503bea58a (patch) | |
| tree | 681288db60c5c7c932bc51005f594515e31144f6 /drivers/net/ethernet/broadcom/bcmsysport.c | |
| parent | Merge branch 'mlx4-next' (diff) | |
| download | linux-dev-126e612223c885a8718839d97c67473503bea58a.tar.xz linux-dev-126e612223c885a8718839d97c67473503bea58a.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcmsysport.c')
| -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) goto err; } - priv->base = devm_request_and_ioremap(&pdev->dev, r); - if (!priv->base) { - dev_err(&pdev->dev, "register remap failed\n"); - ret = -ENOMEM; + priv->base = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(priv->base)) { + ret = PTR_ERR(priv->base); goto err; } |