[PATCH v2 0/2] i2c: fix two wrong mem release

[PATCH v2 0/2] i2c: fix two wrong mem release

[Libo Chen]

fix two wrong mem release

* Changelog from v1:
  * exchange out_error_no_irq and out_error_pin_mux  suggested by Sonic <Sonic.Zhang@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(-)

[PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init successful

[Libo Chen]

down out_error_no_irq. When platform_get_irq fail, no need to free peripheral

Signed-off-by: Libo Chen <libo.chen@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

RE: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init successful

[Zhang, Sonic]

Acked-by: Sonic Zhang <sonic.zhang@analog.com>

>-----Original Message-----
>From: Libo Chen [mailto:libo.chen@huawei.com]
>Sent: Thursday, May 09, 2013 4:27 PM
>To: Zhang, Sonic; wsa@the-dreams.de
>Cc: uclinux-dist-devel@blackfin.uclinux.org; linux-kernel@vger.kernel.org; linux-
>i2c@vger.kernel.org; lizefan@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.chen@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
>
>

RE: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init successful

[Zhang, Sonic]

Hi Libo,

>-----Original Message-----
>From: Libo Chen [mailto:libo.chen@huawei.com]
>Sent: Thursday, May 09, 2013 4:27 PM
>To: Zhang, Sonic; wsa@the-dreams.de
>Cc: uclinux-dist-devel@blackfin.uclinux.org; linux-kernel@vger.kernel.org; linux-
>i2c@vger.kernel.org; lizefan@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.chen@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

Re: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init successful

[Libo Chen]

On 2013/5/9 16:33, Zhang, Sonic wrote:
> Hi Libo,
> 
>> -----Original Message-----
>> From: Libo Chen [mailto:libo.chen@huawei.com]
>> Sent: Thursday, May 09, 2013 4:27 PM
>> To: Zhang, Sonic; wsa@the-dreams.de
>> Cc: uclinux-dist-devel@blackfin.uclinux.org; linux-kernel@vger.kernel.org; linux-
>> i2c@vger.kernel.org; lizefan@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.chen@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
> 

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?


>> 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
> 
> 
> 

RE: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init successful

[Zhang, Sonic]

Hi Libo,

>-----Original Message-----
>From: Libo Chen [mailto:clbchenlibo.chen@huawei.com]
>Sent: Friday, May 10, 2013 9:02 AM
>To: Zhang, Sonic
>Cc: Libo Chen; wsa@the-dreams.de; uclinux-dist-devel@blackfin.uclinux.org;
>linux-kernel@vger.kernel.org; linux-i2c@vger.kernel.org; lizefan@huawei.com
>Subject: Re: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init
>successful
>
>On 2013/5/9 16:33, Zhang, Sonic wrote:
>> Hi Libo,
>>
>>> -----Original Message-----
>>> From: Libo Chen [mailto:libo.chen@huawei.com]
>>> Sent: Thursday, May 09, 2013 4:27 PM
>>> To: Zhang, Sonic; wsa@the-dreams.de
>>> Cc: uclinux-dist-devel@blackfin.uclinux.org;
>>> linux-kernel@vger.kernel.org; linux- i2c@vger.kernel.org;
>>> lizefan@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.chen@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
>>
>
>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?
>
>
Yes, you are right. They are freed in peripheral_request_list() if any one fails.

You have my ACK on this patch.

Regards,

Sonic

RE: [PATCH v2 1/2] i2c: i2c-bfin-twi: don`t free peripheral before it init successful

[Zhang, Sonic]

Please ignore my Ack.

Sonic

>-----Original Message-----
>From: Zhang, Sonic
>Sent: Thursday, May 09, 2013 4:31 PM
>To: 'Libo Chen'; wsa@the-dreams.de
>Cc: uclinux-dist-devel@blackfin.uclinux.org; linux-kernel@vger.kernel.org; linux-
>i2c@vger.kernel.org; lizefan@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.zhang@analog.com>
>
>>-----Original Message-----
>>From: Libo Chen [mailto:libo.chen@huawei.com]
>>Sent: Thursday, May 09, 2013 4:27 PM
>>To: Zhang, Sonic; wsa@the-dreams.de
>>Cc: uclinux-dist-devel@blackfin.uclinux.org;
>>linux-kernel@vger.kernel.org; linux- i2c@vger.kernel.org;
>>lizefan@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.chen@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
>>
>>

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

[Libo Chen]

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.chen@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

Re: [PATCH v2 0/2] i2c: fix two wrong mem release

[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.Zhang@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

Re: [PATCH v2 0/2] i2c: fix two wrong mem release

[Libo Chen]

于 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.Zhang@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