diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-02-24 03:47:24 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-25 00:28:56 (GMT) |
commit | 5343a10d15362da46877d8f07b7c23d4c95f8277 (patch) | |
tree | 1cf365c969bf9d9a22d5848debf3ae2230df0cb4 /drivers | |
parent | 04091142826e5823e31cc6418942ac447b3edb0a (diff) | |
download | linux-5343a10d15362da46877d8f07b7c23d4c95f8277.tar.xz |
net: bcmgenet: Use devm_ioremap_resource()
According to Documentation/driver-model/devres.txt, devm_request_and_ioremap()
is deprecated, so use devm_ioremap_resource() instead.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 0ebc297..844e081 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2481,10 +2481,9 @@ static int bcmgenet_probe(struct platform_device *pdev) } r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - priv->base = devm_request_and_ioremap(&pdev->dev, r); - if (!priv->base) { - dev_err(&pdev->dev, "can't ioremap\n"); - err = -EINVAL; + priv->base = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(priv->base)) { + err = PTR_ERR(priv->base); goto err; } |