[PATCH] net: systemport: Use devm_ioremap_resource()

[PATCH] net: systemport: Use devm_ioremap_resource()

[Jingoo Han]

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/broadcom/bcmsysport.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 4dc8d1e..1fa5205 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1514,10 +1514,9 @@ static int bcm_sysport_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	priv->base = devm_request_and_ioremap(&pdev->dev, r);
-	if (!priv->base) {
-		dev_err(&pdev->dev, "register remap failed\n");
-		ret = -ENOMEM;
+	priv->base = devm_ioremap_resource(&pdev->dev, r);
+	if (IS_ERR(priv->base)) {
+		ret = PTR_ERR(priv->base);
 		goto err;
 	}
 
-- 
1.7.10.4

Re: [PATCH] net: systemport: Use devm_ioremap_resource()

[Florian Fainelli]

2014-05-13 20:15 GMT-07:00 Jingoo Han <jg1.han@samsung.com>:
> Use devm_ioremap_resource() because devm_request_and_ioremap() is
> obsoleted by devm_ioremap_resource().

As of net-next of today, I see nothing that warns when using this
function that it is obsolete, nor is it commented as such, how about
it gets annotated with __deprecated so people stop using it even for
new submissions?

>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

> ---
>  drivers/net/ethernet/broadcom/bcmsysport.c |    7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
> index 4dc8d1e..1fa5205 100644
> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
> @@ -1514,10 +1514,9 @@ static int bcm_sysport_probe(struct platform_device *pdev)
>                 goto err;
>         }
>
> -       priv->base = devm_request_and_ioremap(&pdev->dev, r);
> -       if (!priv->base) {
> -               dev_err(&pdev->dev, "register remap failed\n");
> -               ret = -ENOMEM;
> +       priv->base = devm_ioremap_resource(&pdev->dev, r);
> +       if (IS_ERR(priv->base)) {
> +               ret = PTR_ERR(priv->base);
>                 goto err;
>         }
>
> --
> 1.7.10.4
>
>



-- 
Florian

Re: [PATCH] net: systemport: Use devm_ioremap_resource()

[Jingoo Han]

On Wednesday, May 14, 2014 1:05 PM, Florian Fainelli wrote:
> 2014-05-13 20:15 GMT-07:00 Jingoo Han <jg1.han@samsung.com>:
> > Use devm_ioremap_resource() because devm_request_and_ioremap() is
> > obsoleted by devm_ioremap_resource().
> 
> As of net-next of today, I see nothing that warns when using this
> function that it is obsolete, nor is it commented as such, how about
> it gets annotated with __deprecated so people stop using it even for
> new submissions?

I agree with your suggestion. I will send the patch to mark it as
deprecated. :-)


> 
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> 
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Thank your Acked-by.

Best regards,
Jingoo Han

> 
> > ---
> >  drivers/net/ethernet/broadcom/bcmsysport.c |    7 +++----
> >  1 file changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
> > index 4dc8d1e..1fa5205 100644
> > --- a/drivers/net/ethernet/broadcom/bcmsysport.c
> > +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
> > @@ -1514,10 +1514,9 @@ static int bcm_sysport_probe(struct platform_device *pdev)
> >                 goto err;
> >         }
> >
> > -       priv->base = devm_request_and_ioremap(&pdev->dev, r);
> > -       if (!priv->base) {
> > -               dev_err(&pdev->dev, "register remap failed\n");
> > -               ret = -ENOMEM;
> > +       priv->base = devm_ioremap_resource(&pdev->dev, r);
> > +       if (IS_ERR(priv->base)) {
> > +               ret = PTR_ERR(priv->base);
> >                 goto err;
> >         }
> >
> > --
> > 1.7.10.4

Re: [PATCH] net: systemport: Use devm_ioremap_resource()

[David Miller]

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 13 May 2014 21:05:21 -0700

> 2014-05-13 20:15 GMT-07:00 Jingoo Han <jg1.han@samsung.com>:
>> Use devm_ioremap_resource() because devm_request_and_ioremap() is
>> obsoleted by devm_ioremap_resource().
> 
> As of net-next of today, I see nothing that warns when using this
> function that it is obsolete, nor is it commented as such, how about
> it gets annotated with __deprecated so people stop using it even for
> new submissions?
> 
>>
>> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> 
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Applied to net-next, thanks.