Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[PATCH 2/2] i2c: pxa: no need release_mem_region before request_mem_region successful

4 views
Skip to first unread message

Libo Chen

unread,
May 6, 2013, 9:20:02 AM5/6/13
to

move release_mem_region above kfree(i2c) && below clk_put(i2c->clk)

Signed-off-by: Libo Chen <libo...@huawei.com>
---
drivers/i2c/busses/i2c-pxa.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index ea6d45d..3188cd0 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1129,7 +1129,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
i2c->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(i2c->clk)) {
ret = PTR_ERR(i2c->clk);
- goto eclk;
+ goto emm;
}

i2c->reg_base = ioremap(res->start, resource_size(res));
@@ -1206,10 +1206,11 @@ ereqirq:
iounmap(i2c->reg_base);
eremap:
clk_put(i2c->clk);
+emm:
+ release_mem_region(res->start, resource_size(res));
eclk:
kfree(i2c);
emalloc:
- release_mem_region(res->start, resource_size(res));
return ret;
}

--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Gu Zheng

unread,
May 6, 2013, 11:10:03 PM5/6/13
to
Hi libo,

On 05/06/2013 09:11 PM, Libo Chen wrote:

>
> move release_mem_region above kfree(i2c) && below clk_put(i2c->clk)
>
> Signed-off-by: Libo Chen <libo...@huawei.com>
> ---
> drivers/i2c/busses/i2c-pxa.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
> index ea6d45d..3188cd0 100644
> --- a/drivers/i2c/busses/i2c-pxa.c
> +++ b/drivers/i2c/busses/i2c-pxa.c
> @@ -1129,7 +1129,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
> i2c->clk = clk_get(&dev->dev, NULL);
> if (IS_ERR(i2c->clk)) {
> ret = PTR_ERR(i2c->clk);
> - goto eclk;
> + goto emm;

The new tag 'emm' seems not suitable here, keep the original 'eclk' here, modify the upper 'eclk' tags instead:
...
ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type);
if (ret > 0)
ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type);
if (ret < 0)
- goto eclk;
+ goto etype;

res = platform_get_resource(dev, IORESOURCE_MEM, 0);
irq = platform_get_irq(dev, 0);
if (res == NULL || irq < 0) {
ret = -ENODEV;
- goto eclk;
+ goto edev;
}

if (!request_mem_region(res->start, resource_size(res), res->name)) {
ret = -ENOMEM;
- goto eclk;
+ goto emem;
}
...

> }
>
> i2c->reg_base = ioremap(res->start, resource_size(res));
> @@ -1206,10 +1206,11 @@ ereqirq:
> iounmap(i2c->reg_base);
> eremap:
> clk_put(i2c->clk);
> +emm:
> + release_mem_region(res->start, resource_size(res));
> eclk:
> kfree(i2c);

eclk:
release_mem_region(res->start, resource_size(res));
etype:
edev:
emem:
kfree(i2c);

> emalloc:
> - release_mem_region(res->start, resource_size(res));
> return ret;
> }
>

Thanks,
Gu

Libo Chen

unread,
May 7, 2013, 2:00:01 AM5/7/13
to
Thanks a lot. Yes, it is . Original lable name seems not suitable.
but lable:edev is redundant, useless .

I concern this patch is usefull for your work? However I will change it later.

Thanks,
Libo
> .

Libo Chen

unread,
May 9, 2013, 4:30:01 AM5/9/13
to
When kzalloc fail, there is no reason to release_mem_region

fix confuse tag, add new tag: emem, eirq, edt and make it cleanly

Signed-off-by: Libo Chen <libo...@huawei.com>
---
drivers/i2c/busses/i2c-pxa.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index ea6d45d..a9da954 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1104,18 +1104,18 @@ static int i2c_pxa_probe(struct platform_device *dev)
if (ret > 0)
ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type);
if (ret < 0)
- goto eclk;
+ goto edt;

res = platform_get_resource(dev, IORESOURCE_MEM, 0);
irq = platform_get_irq(dev, 0);
if (res == NULL || irq < 0) {
ret = -ENODEV;
- goto eclk;
+ goto eirq;
}

if (!request_mem_region(res->start, resource_size(res), res->name)) {
ret = -ENOMEM;
- goto eclk;
+ goto emem;
}

i2c->adap.owner = THIS_MODULE;
@@ -1207,9 +1207,12 @@ ereqirq:
eremap:
clk_put(i2c->clk);
eclk:
- kfree(i2c);
-emalloc:
release_mem_region(res->start, resource_size(res));
+emem:
+eirq:
+edt:
+ kfree(i2c);
+emalloc:
return ret;
}

--
1.7.1

Libo Chen

unread,
May 9, 2013, 4:30:01 AM5/9/13
to
fix two wrong mem release

* Changelog from v1:
* exchange out_error_no_irq and out_error_pin_mux suggested by Sonic <Sonic...@analog.com>
* add some new tag , make code cleanly

Libo Chen (2):
i2c: i2c-bfin-twi: don`t free peripheral before it init successful
i2c: pxa: no need release_mem_region before request_mem_region
successful

drivers/i2c/busses/i2c-bfin-twi.c | 2 +-
drivers/i2c/busses/i2c-pxa.c | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)

Libo Chen

unread,
May 9, 2013, 4:30:02 AM5/9/13
to
down out_error_no_irq. When platform_get_irq fail, no need to free peripheral

Signed-off-by: Libo Chen <libo...@huawei.com>
---
drivers/i2c/busses/i2c-bfin-twi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 05080c4..6617645 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -709,9 +709,9 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
out_error_add_adapter:
free_irq(iface->irq, iface);
out_error_req_irq:
-out_error_no_irq:
peripheral_free_list((unsigned short *)pdev->dev.platform_data);
out_error_pin_mux:
+out_error_no_irq:
iounmap(iface->regs_base);
out_error_ioremap:
out_error_get_res:
--
1.7.1

Zhang, Sonic

unread,
May 9, 2013, 4:40:11 AM5/9/13
to
Please ignore my Ack.

Sonic

>-----Original Message-----
>From: Zhang, Sonic
>Sent: Thursday, May 09, 2013 4:31 PM
>To: 'Libo Chen'; w...@the-dreams.de
>Cc: uclinux-d...@blackfin.uclinux.org; linux-...@vger.kernel.org; linux-
>i...@vger.kernel.org; liz...@huawei.com
>Subject: RE: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init
>successful
>
>Acked-by: Sonic Zhang <sonic...@analog.com>
>
>>-----Original Message-----
>>From: Libo Chen [mailto:libo...@huawei.com]
>>Sent: Thursday, May 09, 2013 4:27 PM
>>To: Zhang, Sonic; w...@the-dreams.de
>>Cc: uclinux-d...@blackfin.uclinux.org;
>>linux-...@vger.kernel.org; linux- i...@vger.kernel.org;
>>liz...@huawei.com; Libo Chen
>>Subject: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before
>>it init successful
>>

Zhang, Sonic

unread,
May 9, 2013, 4:40:14 AM5/9/13
to
Acked-by: Sonic Zhang <sonic...@analog.com>

>-----Original Message-----
>From: Libo Chen [mailto:libo...@huawei.com]
>Sent: Thursday, May 09, 2013 4:27 PM
>To: Zhang, Sonic; w...@the-dreams.de
>Cc: uclinux-d...@blackfin.uclinux.org; linux-...@vger.kernel.org; linux-
>i...@vger.kernel.org; liz...@huawei.com; Libo Chen
>Subject: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init
>successful
>

Zhang, Sonic

unread,
May 9, 2013, 4:40:15 AM5/9/13
to
Hi Libo,

>-----Original Message-----
>From: Libo Chen [mailto:libo...@huawei.com]
>Sent: Thursday, May 09, 2013 4:27 PM
>To: Zhang, Sonic; w...@the-dreams.de
>Cc: uclinux-d...@blackfin.uclinux.org; linux-...@vger.kernel.org; linux-
>i...@vger.kernel.org; liz...@huawei.com; Libo Chen
>Subject: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init
>successful
>
>down out_error_no_irq. When platform_get_irq fail, no need to free peripheral
>
>Signed-off-by: Libo Chen <libo...@huawei.com>
>---
> drivers/i2c/busses/i2c-bfin-twi.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
>index 05080c4..6617645 100644
>--- a/drivers/i2c/busses/i2c-bfin-twi.c
>+++ b/drivers/i2c/busses/i2c-bfin-twi.c
>@@ -709,9 +709,9 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
> out_error_add_adapter:
> free_irq(iface->irq, iface);
> out_error_req_irq:
>-out_error_no_irq:
> peripheral_free_list((unsigned short *)pdev->dev.platform_data);
> out_error_pin_mux:
>+out_error_no_irq:
> iounmap(iface->regs_base);
> out_error_ioremap:
> out_error_get_res:
>--

Sorry, but you didn't exchange as I suggested.
Should be

> out_error_req_irq:
>-out_error_no_irq:
>+out_error_pin_mux:
> peripheral_free_list((unsigned short *)pdev->dev.platform_data);
>-out_error_pin_mux:
>+out_error_no_irq:


Regards,

Sonic

Libo Chen

unread,
May 9, 2013, 9:10:01 PM5/9/13
to
Hi Sonic,

Look at peripheral_request_list()
{
u16 cnt;
int ret;

for (cnt = 0; per[cnt] != 0; cnt++) {

ret = peripheral_request(per[cnt], label);

if (ret < 0) {
for ( ; cnt > 0; cnt--)
peripheral_free(per[cnt - 1]);

return ret;
}
}

return 0;
}


When peripheral_request fail, it had called peripheral_free().
So there is no reason to call peripheral_free_list again.

Did I miss something else?

Zhang, Sonic

unread,
May 13, 2013, 5:00:02 AM5/13/13
to
Yes, you are right. They are freed in peripheral_request_list() if any one fails.

You have my ACK on this patch.

Wolfram Sang

unread,
May 17, 2013, 5:50:02 AM5/17/13
to
On Thu, May 09, 2013 at 04:27:22PM +0800, Libo Chen wrote:
> fix two wrong mem release
>
> * Changelog from v1:
> * exchange out_error_no_irq and out_error_pin_mux suggested by Sonic <Sonic...@analog.com>
> * add some new tag , make code cleanly

Thanks for the submission. I do think the proper solution would be to
convert the drivers to use the devm_* mechanisms, though. You can check
commit 857968434bb6dbda0911f38ec46b0c3d0c963771 ("i2c: davinci: update
to devm_* API") as a reference.

Thanks,

Wolfram

Libo Chen

unread,
May 18, 2013, 10:20:02 PM5/18/13
to
于 2013-5-17 17:43, Wolfram Sang 写道:
> On Thu, May 09, 2013 at 04:27:22PM +0800, Libo Chen wrote:
>> >fix two wrong mem release
>> >
>> >* Changelog from v1:
>> > * exchange out_error_no_irq and out_error_pin_mux suggested by Sonic<Sonic...@analog.com>
>> > * add some new tag , make code cleanly
> Thanks for the submission. I do think the proper solution would be to
> convert the drivers to use the devm_* mechanisms, though. You can check
> commit 857968434bb6dbda0911f38ec46b0c3d0c963771 ("i2c: davinci: update
> to devm_* API") as a reference.
>
> Thanks,
>
> Wolfram

Hi, Wolfram

It is a good idea. I will learn about it.

Thanks,
Libo
0 new messages