2020-11-12 05:38:57

by Chris Packham

[permalink] [raw]
Subject: [PATCH] bus: mvebu-mbus: make iounmap() symmetric with ioremap()

make coccicheck complains:

./drivers/bus/mvebu-mbus.c:1113:2-8: ERROR: missing iounmap; ioremap on line 1106 and execution via conditional on line 1111

It took some staring but I don't think there is a problem because the
file global `mbus_state` is passed mvebu_mbus_common_init() as the
`mbus` parameter so `mbus_state.mbuswins_base` and `mbus->mbuswins_base`
are the same thing. But this is confusing for anyone reading the code
and one less complaint from coccicheck would be nice so lets fix it.

Signed-off-by: Chris Packham <[email protected]>
---
I haven't included

Fixes: fddddb52a6c4 ("bus: introduce an Marvell EBU MBus driver")

because that commit is quite old and it's probably not worth bothering
the stable trees with what is essentially a no-op.

drivers/bus/mvebu-mbus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 2519ceede64b..dd9e7343a5e3 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -1111,7 +1111,7 @@ static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus,

mbus->sdramwins_base = ioremap(sdramwins_phys_base, sdramwins_size);
if (!mbus->sdramwins_base) {
- iounmap(mbus_state.mbuswins_base);
+ iounmap(mbus->mbuswins_base);
return -ENOMEM;
}

--
2.29.2


2020-11-12 08:10:25

by Thomas Petazzoni

[permalink] [raw]
Subject: Re: [PATCH] bus: mvebu-mbus: make iounmap() symmetric with ioremap()

On Thu, 12 Nov 2020 16:21:49 +1300
Chris Packham <[email protected]> wrote:

> make coccicheck complains:
>
> ./drivers/bus/mvebu-mbus.c:1113:2-8: ERROR: missing iounmap; ioremap on line 1106 and execution via conditional on line 1111
>
> It took some staring but I don't think there is a problem because the
> file global `mbus_state` is passed mvebu_mbus_common_init() as the
> `mbus` parameter so `mbus_state.mbuswins_base` and `mbus->mbuswins_base`
> are the same thing. But this is confusing for anyone reading the code
> and one less complaint from coccicheck would be nice so lets fix it.
>
> Signed-off-by: Chris Packham <[email protected]>

Acked-by: Thomas Petazzoni <[email protected]>

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

2021-01-26 12:33:53

by Chris Packham

[permalink] [raw]
Subject: Re: [PATCH] bus: mvebu-mbus: make iounmap() symmetric with ioremap()

Hi All,

On 12/11/20 9:02 pm, Thomas Petazzoni wrote:
> On Thu, 12 Nov 2020 16:21:49 +1300
> Chris Packham <[email protected]> wrote:
>
>> make coccicheck complains:
>>
>> ./drivers/bus/mvebu-mbus.c:1113:2-8: ERROR: missing iounmap; ioremap on line 1106 and execution via conditional on line 1111
>>
>> It took some staring but I don't think there is a problem because the
>> file global `mbus_state` is passed mvebu_mbus_common_init() as the
>> `mbus` parameter so `mbus_state.mbuswins_base` and `mbus->mbuswins_base`
>> are the same thing. But this is confusing for anyone reading the code
>> and one less complaint from coccicheck would be nice so lets fix it.
>>
>> Signed-off-by: Chris Packham <[email protected]>
> Acked-by: Thomas Petazzoni <[email protected]>

Just going through some old branches. This doesn't seem to have been
picked up. Have I missed a maintainer?

2021-01-27 05:59:34

by Thomas Petazzoni

[permalink] [raw]
Subject: Re: [PATCH] bus: mvebu-mbus: make iounmap() symmetric with ioremap()

On Tue, 26 Jan 2021 01:48:23 +0000
Chris Packham <[email protected]> wrote:

> Hi All,
>
> On 12/11/20 9:02 pm, Thomas Petazzoni wrote:
> > On Thu, 12 Nov 2020 16:21:49 +1300
> > Chris Packham <[email protected]> wrote:
> >
> >> make coccicheck complains:
> >>
> >> ./drivers/bus/mvebu-mbus.c:1113:2-8: ERROR: missing iounmap; ioremap on line 1106 and execution via conditional on line 1111
> >>
> >> It took some staring but I don't think there is a problem because the
> >> file global `mbus_state` is passed mvebu_mbus_common_init() as the
> >> `mbus` parameter so `mbus_state.mbuswins_base` and `mbus->mbuswins_base`
> >> are the same thing. But this is confusing for anyone reading the code
> >> and one less complaint from coccicheck would be nice so lets fix it.
> >>
> >> Signed-off-by: Chris Packham <[email protected]>
> > Acked-by: Thomas Petazzoni <[email protected]>
>
> Just going through some old branches. This doesn't seem to have been
> picked up. Have I missed a maintainer?

+Gregory Clement in Cc. Greg, the original patch from Chris is touching
drivers/bus/mvebu-mbus.c, so I think you should be taking that patch.

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

2021-01-29 16:34:28

by Thomas Petazzoni

[permalink] [raw]
Subject: Re: [PATCH] bus: mvebu-mbus: make iounmap() symmetric with ioremap()

On Fri, 29 Jan 2021 17:01:35 +0100
Gregory CLEMENT <[email protected]> wrote:

> Could you sent me the patch I don't have it in my emails boxes.

https://lore.kernel.org/lkml/[email protected]/raw

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

2021-01-29 17:04:38

by Gregory CLEMENT

[permalink] [raw]
Subject: Re: [PATCH] bus: mvebu-mbus: make iounmap() symmetric with ioremap()

Hi,

> On Fri, 29 Jan 2021 17:01:35 +0100
> Gregory CLEMENT <[email protected]> wrote:
>
>> Could you sent me the patch I don't have it in my emails boxes.
>
> https://lore.kernel.org/lkml/[email protected]/raw


Applied on mvebu/arm

Thanks,

Gregory

>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com