[net-next] net: ethernet: ti: use devm_platform_ioremap_resource() to simplify code
diff mbox series

Message ID 20190821124850.9592-1-yuehaibing@huawei.com
State New
Headers show
Series
  • [net-next] net: ethernet: ti: use devm_platform_ioremap_resource() to simplify code
Related show

Commit Message

Yuehaibing Aug. 21, 2019, 12:48 p.m. UTC
Use devm_platform_ioremap_resource() to simplify the code a bit.
This is detected by coccinelle.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/net/ethernet/ti/cpsw.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Grygorii Strashko Aug. 21, 2019, 2:20 p.m. UTC | #1
On 21/08/2019 15:48, YueHaibing wrote:
> Use devm_platform_ioremap_resource() to simplify the code a bit.
> This is detected by coccinelle.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>   drivers/net/ethernet/ti/cpsw.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>

Thank you.
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
David Miller Aug. 21, 2019, 8:42 p.m. UTC | #2
From: YueHaibing <yuehaibing@huawei.com>
Date: Wed, 21 Aug 2019 20:48:50 +0800

> Use devm_platform_ioremap_resource() to simplify the code a bit.
> This is detected by coccinelle.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Applied.
Geert Uytterhoeven Sept. 17, 2019, 6:35 p.m. UTC | #3
Hi YueHaibing,

On Wed, Aug 21, 2019 at 2:51 PM YueHaibing <yuehaibing@huawei.com> wrote:
> Use devm_platform_ioremap_resource() to simplify the code a bit.
> This is detected by coccinelle.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  drivers/net/ethernet/ti/cpsw.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
> index 32a8974..5401095 100644
> --- a/drivers/net/ethernet/ti/cpsw.c
> +++ b/drivers/net/ethernet/ti/cpsw.c
> @@ -2764,7 +2764,7 @@ static int cpsw_probe(struct platform_device *pdev)
>         struct net_device               *ndev;
>         struct cpsw_priv                *priv;
>         void __iomem                    *ss_regs;
> -       struct resource                 *res, *ss_res;
> +       struct resource                 *ss_res;
>         struct gpio_descs               *mode;
>         const struct soc_device_attribute *soc;
>         struct cpsw_common              *cpsw;
> @@ -2798,8 +2798,7 @@ static int cpsw_probe(struct platform_device *pdev)

And just out-of-context, we also have:

        ss_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        ss_regs = devm_ioremap_resource(dev, ss_res);
        if (IS_ERR(ss_regs))

which was not detected as being the same pattern?

Interesting...

>                 return PTR_ERR(ss_regs);
>         cpsw->regs = ss_regs;
>
> -       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> -       cpsw->wr_regs = devm_ioremap_resource(dev, res);
> +       cpsw->wr_regs = devm_platform_ioremap_resource(pdev, 1);
>         if (IS_ERR(cpsw->wr_regs))
>                 return PTR_ERR(cpsw->wr_regs);

Gr{oetje,eeting}s,

                        Geert
Grygorii Strashko Sept. 18, 2019, 9:29 a.m. UTC | #4
On 17/09/2019 21:35, Geert Uytterhoeven wrote:
> Hi YueHaibing,
> 
> On Wed, Aug 21, 2019 at 2:51 PM YueHaibing <yuehaibing@huawei.com> wrote:
>> Use devm_platform_ioremap_resource() to simplify the code a bit.
>> This is detected by coccinelle.
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>>   drivers/net/ethernet/ti/cpsw.c | 5 ++---
>>   1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
>> index 32a8974..5401095 100644
>> --- a/drivers/net/ethernet/ti/cpsw.c
>> +++ b/drivers/net/ethernet/ti/cpsw.c
>> @@ -2764,7 +2764,7 @@ static int cpsw_probe(struct platform_device *pdev)
>>          struct net_device               *ndev;
>>          struct cpsw_priv                *priv;
>>          void __iomem                    *ss_regs;
>> -       struct resource                 *res, *ss_res;
>> +       struct resource                 *ss_res;
>>          struct gpio_descs               *mode;
>>          const struct soc_device_attribute *soc;
>>          struct cpsw_common              *cpsw;
>> @@ -2798,8 +2798,7 @@ static int cpsw_probe(struct platform_device *pdev)
> 
> And just out-of-context, we also have:
> 
>          ss_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>          ss_regs = devm_ioremap_resource(dev, ss_res);
>          if (IS_ERR(ss_regs))
> 
> which was not detected as being the same pattern?
> 
> Interesting...

ss_res is used below to determine phys address of CPPI RAM.

> 
>>                  return PTR_ERR(ss_regs);
>>          cpsw->regs = ss_regs;
>>
>> -       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>> -       cpsw->wr_regs = devm_ioremap_resource(dev, res);
>> +       cpsw->wr_regs = devm_platform_ioremap_resource(pdev, 1);
>>          if (IS_ERR(cpsw->wr_regs))
>>                  return PTR_ERR(cpsw->wr_regs);
Geert Uytterhoeven Sept. 18, 2019, 9:35 a.m. UTC | #5
Hi Grygorii,

On Wed, Sep 18, 2019 at 11:29 AM Grygorii Strashko
<grygorii.strashko@ti.com> wrote:
> On 17/09/2019 21:35, Geert Uytterhoeven wrote:
> > On Wed, Aug 21, 2019 at 2:51 PM YueHaibing <yuehaibing@huawei.com> wrote:
> >> Use devm_platform_ioremap_resource() to simplify the code a bit.
> >> This is detected by coccinelle.
> >>
> >> Reported-by: Hulk Robot <hulkci@huawei.com>
> >> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> >> ---
> >>   drivers/net/ethernet/ti/cpsw.c | 5 ++---
> >>   1 file changed, 2 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
> >> index 32a8974..5401095 100644
> >> --- a/drivers/net/ethernet/ti/cpsw.c
> >> +++ b/drivers/net/ethernet/ti/cpsw.c
> >> @@ -2764,7 +2764,7 @@ static int cpsw_probe(struct platform_device *pdev)
> >>          struct net_device               *ndev;
> >>          struct cpsw_priv                *priv;
> >>          void __iomem                    *ss_regs;
> >> -       struct resource                 *res, *ss_res;
> >> +       struct resource                 *ss_res;
> >>          struct gpio_descs               *mode;
> >>          const struct soc_device_attribute *soc;
> >>          struct cpsw_common              *cpsw;
> >> @@ -2798,8 +2798,7 @@ static int cpsw_probe(struct platform_device *pdev)
> >
> > And just out-of-context, we also have:
> >
> >          ss_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> >          ss_regs = devm_ioremap_resource(dev, ss_res);
> >          if (IS_ERR(ss_regs))
> >
> > which was not detected as being the same pattern?
> >
> > Interesting...
>
> ss_res is used below to determine phys address of CPPI RAM.

Right, thanks, I missed that.

> >
> >>                  return PTR_ERR(ss_regs);
> >>          cpsw->regs = ss_regs;
> >>
> >> -       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> >> -       cpsw->wr_regs = devm_ioremap_resource(dev, res);
> >> +       cpsw->wr_regs = devm_platform_ioremap_resource(pdev, 1);
> >>          if (IS_ERR(cpsw->wr_regs))
> >>                  return PTR_ERR(cpsw->wr_regs);

Gr{oetje,eeting}s,

                        Geert

Patch
diff mbox series

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 32a8974..5401095 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2764,7 +2764,7 @@  static int cpsw_probe(struct platform_device *pdev)
 	struct net_device		*ndev;
 	struct cpsw_priv		*priv;
 	void __iomem			*ss_regs;
-	struct resource			*res, *ss_res;
+	struct resource			*ss_res;
 	struct gpio_descs		*mode;
 	const struct soc_device_attribute *soc;
 	struct cpsw_common		*cpsw;
@@ -2798,8 +2798,7 @@  static int cpsw_probe(struct platform_device *pdev)
 		return PTR_ERR(ss_regs);
 	cpsw->regs = ss_regs;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-	cpsw->wr_regs = devm_ioremap_resource(dev, res);
+	cpsw->wr_regs = devm_platform_ioremap_resource(pdev, 1);
 	if (IS_ERR(cpsw->wr_regs))
 		return PTR_ERR(cpsw->wr_regs);