Skip to contentSkip to conversation

net: bcmgenet: Use devm_ioremap_resource()

PATCH Applied Fabio Estevam 3 participants 3 messages Feb 24, 2014 – Feb 25, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: bcmgenet: Use devm_ioremap_resource()

From: Fabio Estevam <[email protected]>

According to Documentation/driver-model/devres.txt, devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource() instead.

---
Changes since v1:
- Fix subject

 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +3 -4
index 0ebc297..844e081 100644
@@ -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;
 	}
 
Signature · 1 line
1.8.1.2
Acked-by on v2 1/1
#1 lore raw

2014-02-23 19:47 GMT-08:00 Fabio Estevam <[email protected]>:

Quoted 4 lines

From: Fabio Estevam <[email protected]>

According to Documentation/driver-model/devres.txt, devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource() instead.

Quoted 30 lines

---
Changes since v1:
- Fix subject

 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +3 -5
index 0ebc297..844e081 100644
@@ -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;
        }
 
--

1.8.1.2

Signature · 1 line
Florian