2020-09-24 06:43:03

by Qinglang Miao

Subject: [PATCH -next] MIPS: OCTEON: fix error - use 'ret' after remove it

Variable ret was removed in commit 0ee69c589ec("MIPS: OCTEON:
use devm_platform_ioremap_resource") but still being used in
devm_release_mem_region which is unneeded. So remove this
line to fix error.

Fixes: 0ee69c589ec("MIPS: OCTEON: use devm_platform_ioremap_resource")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Qinglang Miao <[email protected]>
---
arch/mips/cavium-octeon/octeon-usb.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c
index 97f6dc31e1b4..987a94cbf3d0 100644
--- a/arch/mips/cavium-octeon/octeon-usb.c
+++ b/arch/mips/cavium-octeon/octeon-usb.c
@@ -534,8 +534,6 @@ static int __init dwc3_octeon_device_init(void)
dev_info(&pdev->dev, "clocks initialized.\n");
mutex_unlock(&dwc3_octeon_clocks_mutex);
devm_iounmap(&pdev->dev, base);
- devm_release_mem_region(&pdev->dev, res->start,
- resource_size(res));
}
} while (node != NULL);

--
2.23.0

2020-09-24 08:18:24

by Sergei Shtylyov

Subject: Re: [PATCH -next] MIPS: OCTEON: fix error - use 'ret' after remove it

Hello!

On 24.09.2020 9:41, Qinglang Miao wrote:

> Variable ret was removed in commit 0ee69c589ec("MIPS: OCTEON:

I'm only seeing the variable 'res' below...

> use devm_platform_ioremap_resource") but still being used in
> devm_release_mem_region which is unneeded. So remove this
> line to fix error.
>
> Fixes: 0ee69c589ec("MIPS: OCTEON: use devm_platform_ioremap_resource")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
> arch/mips/cavium-octeon/octeon-usb.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c
> index 97f6dc31e1b4..987a94cbf3d0 100644
> --- a/arch/mips/cavium-octeon/octeon-usb.c
> +++ b/arch/mips/cavium-octeon/octeon-usb.c
> @@ -534,8 +534,6 @@ static int __init dwc3_octeon_device_init(void)
> dev_info(&pdev->dev, "clocks initialized.\n");
> mutex_unlock(&dwc3_octeon_clocks_mutex);
> devm_iounmap(&pdev->dev, base);
> - devm_release_mem_region(&pdev->dev, res->start,
> - resource_size(res));
> }
> } while (node != NULL);
>

MBR, Sergei

2020-09-24 08:53:50

by Thomas Bogendoerfer

Subject: Re: [PATCH -next] MIPS: OCTEON: fix error - use 'ret' after remove it

On Thu, Sep 24, 2020 at 02:41:42PM +0800, Qinglang Miao wrote:
> Variable ret was removed in commit 0ee69c589ec("MIPS: OCTEON:
> use devm_platform_ioremap_resource") but still being used in
> devm_release_mem_region which is unneeded. So remove this
> line to fix error.
>
> Fixes: 0ee69c589ec("MIPS: OCTEON: use devm_platform_ioremap_resource")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
> arch/mips/cavium-octeon/octeon-usb.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c
> index 97f6dc31e1b4..987a94cbf3d0 100644
> --- a/arch/mips/cavium-octeon/octeon-usb.c
> +++ b/arch/mips/cavium-octeon/octeon-usb.c
> @@ -534,8 +534,6 @@ static int __init dwc3_octeon_device_init(void)
> dev_info(&pdev->dev, "clocks initialized.\n");
> mutex_unlock(&dwc3_octeon_clocks_mutex);
> devm_iounmap(&pdev->dev, base);
> - devm_release_mem_region(&pdev->dev, res->start,
> - resource_size(res));
> }
> } while (node != NULL);

I've reverted the orginal fix as IMHO the whole change is wrong.
The code maps/unmaps the io region to setup clocks and phy and
releases everything so the real driver can pick it up later.
The devm_release_mem_region is important and since the device
continues to exists, there is not auto-cleanup.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]