2013-05-12 15:47:35

by Laurent Navet

Subject: [PATCH] drivers: net: ethernet: broadcom: bcm63xx: use devm_ioremap_resource()

Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.

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

Signed-off-by: Laurent Navet <[email protected]>
---
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 0b3e23e..9de4217 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1641,9 +1641,9 @@ static int bcm_enet_probe(struct platform_device *pdev)
if (ret)
goto out;

- priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);
- if (priv->base == NULL) {
- ret = -ENOMEM;
+ priv->base = devm_ioremap_resource(&pdev->dev, res_mem);
+ if (IS_ERR(priv->base)) {
+ ret = PTR_ERR(priv->base);
goto out;
}

--
1.7.10.4

2013-05-12 15:53:12

by Laurent Navet

Subject: Re: [PATCH] drivers: net: ethernet: broadcom: bcm63xx: use devm_ioremap_resource()

Please, don't take this one

I'll send a more complete one later,
Sorry,

2013/5/12, Laurent Navet <[email protected]>:
> Replace a call to deprecated devm_request_and_ioremap by
> devm_ioremap_resource.
>
> Found with coccicheck and this semantic patch:
> scripts/coccinelle/api/devm_ioremap_resource.cocci
>
> Signed-off-by: Laurent Navet <[email protected]>
> ---
> drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> index 0b3e23e..9de4217 100644
> --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> @@ -1641,9 +1641,9 @@ static int bcm_enet_probe(struct platform_device
> *pdev)
> if (ret)
> goto out;
>
> - priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);
> - if (priv->base == NULL) {
> - ret = -ENOMEM;
> + priv->base = devm_ioremap_resource(&pdev->dev, res_mem);
> + if (IS_ERR(priv->base)) {
> + ret = PTR_ERR(priv->base);
> goto out;
> }
>
> --
> 1.7.10.4
>
>


--
« On ne résout pas un problème avec les modes de pensée qui l’ont engendré. »
« You cannot solve current problems with current thinking. Current
problems are the result of current thinking »

2013-05-12 18:38:43

by Sergei Shtylyov

Subject: Re: [PATCH] drivers: net: ethernet: broadcom: bcm63xx: use devm_ioremap_resource()

Hello.

On 05/12/2013 07:56 PM, Laurent Navet wrote:

> Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.
>
> Found with coccicheck and this semantic patch:
> scripts/coccinelle/api/devm_ioremap_resource.cocci
>
> Signed-off-by: Laurent Navet <[email protected]>
> ---
> drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> index 0b3e23e..9de4217 100644
> --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> @@ -1641,9 +1641,9 @@ static int bcm_enet_probe(struct platform_device *pdev)
> if (ret)
> goto out;
>
> - priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);
> - if (priv->base == NULL) {
> - ret = -ENOMEM;
> + priv->base = devm_ioremap_resource(&pdev->dev, res_mem);
> + if (IS_ERR(priv->base)) {
> + ret = PTR_ERR(priv->base);
> goto out;
> }
>

You may as well delete a check for 'res_mem' being NULL above
alloc_etherdev()
call since devm_ioremap_resource() checks for that too.

WBR, Sergei