diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-02-23 22:47:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-24 19:28:56 -0500 |
commit | 5343a10d15362da46877d8f07b7c23d4c95f8277 (patch) | |
tree | 1cf365c969bf9d9a22d5848debf3ae2230df0cb4 | |
parent | 04091142826e5823e31cc6418942ac447b3edb0a (diff) |
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>
-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 0ebc29769510..844e0811388d 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) | |||
2481 | } | 2481 | } |
2482 | 2482 | ||
2483 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2483 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
2484 | priv->base = devm_request_and_ioremap(&pdev->dev, r); | 2484 | priv->base = devm_ioremap_resource(&pdev->dev, r); |
2485 | if (!priv->base) { | 2485 | if (IS_ERR(priv->base)) { |
2486 | dev_err(&pdev->dev, "can't ioremap\n"); | 2486 | err = PTR_ERR(priv->base); |
2487 | err = -EINVAL; | ||
2488 | goto err; | 2487 | goto err; |
2489 | } | 2488 | } |
2490 | 2489 | ||