[PATCH] net: ethernet: freescale: use devm_ioremap_resource()

Subsystems: freescale imx / mxc fec driver, networking drivers, the rest

STALE4880d

5 messages, 3 authors, 2013-05-28 · open the first message on its own page

[PATCH] net: ethernet: freescale: use devm_ioremap_resource()

From: Laurent Navet <hidden>
Date: 2013-05-13 19:29:19

Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.
also remove tests on 'r' since devm_ioremap_resource() checks for it
in a better way.

Found with coccicheck and this semantic patch:
 scripts/coccinelle/api/devm_ioremap_resource.cocci

Signed-off-by: Laurent Navet <redacted>
---
 drivers/net/ethernet/freescale/fec_main.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index aff0310..0afc7ff 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c

@@ -1843,8 +1843,6 @@ fec_probe(struct platform_device *pdev)
 		pdev->id_entry = of_id->data;
 
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!r)
-		return -ENXIO;
 
 	/* Init network device */
 	ndev = alloc_etherdev(sizeof(struct fec_enet_private));

@@ -1861,17 +1859,16 @@ fec_probe(struct platform_device *pdev)
 	    (pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
 		fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
 
-	fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
+	fep->hwp = devm_ioremap_resource(&pdev->dev, r);
+	if (IS_ERR(fep->hwp)) {
+		ret = PTR_ERR(fep->hwp);
+		goto failed_ioremap;
+	}
 	fep->pdev = pdev;
 	fep->dev_id = dev_id++;
 
 	fep->bufdesc_ex = 0;
 
-	if (!fep->hwp) {
-		ret = -ENOMEM;
-		goto failed_ioremap;
-	}
-
 	platform_set_drvdata(pdev, ndev);
 
 	ret = of_get_phy_mode(pdev->dev.of_node);

-- 
1.7.10.4

Re: [PATCH] net: ethernet: freescale: use devm_ioremap_resource()

From: Frank Li <hidden>
Date: 2013-05-14 06:21:57

2013/5/14 Laurent Navet [off-list ref]:

quoted hunk

Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.
also remove tests on 'r' since devm_ioremap_resource() checks for it
in a better way.

Found with coccicheck and this semantic patch:
 scripts/coccinelle/api/devm_ioremap_resource.cocci

Signed-off-by: Laurent Navet <redacted>
---
 drivers/net/ethernet/freescale/fec_main.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index aff0310..0afc7ff 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c

@@ -1843,8 +1843,6 @@ fec_probe(struct platform_device *pdev)
                pdev->id_entry = of_id->data;

        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!r)
-               return -ENXIO;

why remove this check?

quoted hunk

        /* Init network device */
        ndev = alloc_etherdev(sizeof(struct fec_enet_private));

@@ -1861,17 +1859,16 @@ fec_probe(struct platform_device *pdev)
            (pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
                fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;

-       fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
+       fep->hwp = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(fep->hwp)) {
+               ret = PTR_ERR(fep->hwp);
+               goto failed_ioremap;
+       }
        fep->pdev = pdev;
        fep->dev_id = dev_id++;

        fep->bufdesc_ex = 0;

-       if (!fep->hwp) {
-               ret = -ENOMEM;
-               goto failed_ioremap;
-       }
-
        platform_set_drvdata(pdev, ndev);

        ret = of_get_phy_mode(pdev->dev.of_node);
--

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] net: ethernet: freescale: use devm_ioremap_resource()

From: Laurent Navet <hidden>
Date: 2013-05-14 07:09:21

quoted

--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c

@@ -1843,8 +1843,6 @@ fec_probe(struct platform_device *pdev)
                pdev->id_entry = of_id->data;

        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!r)
-               return -ENXIO;

why remove this check?

it's already checked in devm_ioremap_resource in a better way,

void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
 {
...
         if (!res || resource_type(res) != IORESOURCE_MEM) {
                 dev_err(dev, "invalid resource\n");
                 return ERR_PTR(-EINVAL);
         }
...

Laurent.

Re: [PATCH] net: ethernet: freescale: use devm_ioremap_resource()

From: Frank Li <hidden>
Date: 2013-05-14 14:03:57

2013/5/14 Laurent Navet [off-list ref]:

struct resource *res)
 {
...
         if (!res || resource_type(res) != IORESOURCE_MEM) {
                 dev_err(dev, "invalid resource\n");
                 return ERR_PTR(-EINVAL);

Okay, thanks.
Acked

Re: [PATCH] net: ethernet: freescale: use devm_ioremap_resource()

From: Fabio Estevam <festevam@gmail.com>
Date: 2013-05-28 18:32:35

Hi Laurent,

On Mon, May 13, 2013 at 4:37 PM, Laurent Navet [off-list ref] wrote:

Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.
also remove tests on 'r' since devm_ioremap_resource() checks for it
in a better way.

Found with coccicheck and this semantic patch:
 scripts/coccinelle/api/devm_ioremap_resource.cocci

Signed-off-by: Laurent Navet <redacted>

I was about to do the same change, then I saw your patch :-)

Looks good:

Tested-by: Fabio Estevam <redacted>

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help