hwmon: s3c-hwmon: Use devm_kzalloc instead of kzalloc

Message ID 1342170388-5682-1-git-send-email-sachin.kamat@linaro.org
State Accepted
Headers show

Commit Message

Sachin Kamat July 13, 2012, 9:06 a.m.
This makes the code simpler as explicit freeing is not needed.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/hwmon/s3c-hwmon.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

Comments

Jean Delvare July 13, 2012, 11:06 a.m. | #1
On Fri, 13 Jul 2012 14:36:28 +0530, Sachin Kamat wrote:
> This makes the code simpler as explicit freeing is not needed.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/hwmon/s3c-hwmon.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)
>

I'm afraid Guenter was faster:

http://git.kernel.org/?p=linux/kernel/git/groeck/linux-staging.git;a=commitdiff;h=6f66b055060eee17b4c0c18f2d5c1efa04682e11
Sachin Kamat July 13, 2012, 11:13 a.m. | #2
On 13/07/2012, Jean Delvare <khali@linux-fr.org> wrote:
> On Fri, 13 Jul 2012 14:36:28 +0530, Sachin Kamat wrote:
>> This makes the code simpler as explicit freeing is not needed.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> ---
>>  drivers/hwmon/s3c-hwmon.c |    7 ++-----
>>  1 files changed, 2 insertions(+), 5 deletions(-)
>>
>
> I'm afraid Guenter was faster:
>
> http://git.kernel.org/?p=linux/kernel/git/groeck/linux-staging.git;a=commitdiff;h=6f66b055060eee17b4c0c18f2d5c1efa04682e11

Oops.. :)
I did not find it in the linux-next tree.. hence was not aware..

>
> --
> Jean Delvare
>
Guenter Roeck July 13, 2012, 2:34 p.m. | #3
On Fri, Jul 13, 2012 at 04:43:12PM +0530, Sachin Kamat wrote:
> On 13/07/2012, Jean Delvare <khali@linux-fr.org> wrote:
> > On Fri, 13 Jul 2012 14:36:28 +0530, Sachin Kamat wrote:
> >> This makes the code simpler as explicit freeing is not needed.
> >>
> >> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> >> ---
> >>  drivers/hwmon/s3c-hwmon.c |    7 ++-----
> >>  1 files changed, 2 insertions(+), 5 deletions(-)
> >>
> >
> > I'm afraid Guenter was faster:
> >
> > http://git.kernel.org/?p=linux/kernel/git/groeck/linux-staging.git;a=commitdiff;h=6f66b055060eee17b4c0c18f2d5c1efa04682e11
> 
> Oops.. :)
> I did not find it in the linux-next tree.. hence was not aware..
> 
No problem.

I have around 50 or so of those patches still pending in my -staging tree,
because I did not get an Acked-by or Reviewed-by.

Given that, your patch is fine ... it gives me a second Signed-off, so I can
push it forward.

Thanks,
Guenter
Sachin Kamat July 13, 2012, 2:59 p.m. | #4
Hi Guenter,

On 13 July 2012 20:04, Guenter Roeck <linux@roeck-us.net> wrote:
> On Fri, Jul 13, 2012 at 04:43:12PM +0530, Sachin Kamat wrote:
>> On 13/07/2012, Jean Delvare <khali@linux-fr.org> wrote:
>> > On Fri, 13 Jul 2012 14:36:28 +0530, Sachin Kamat wrote:
>> >> This makes the code simpler as explicit freeing is not needed.
>> >>
>> >> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> >> ---
>> >>  drivers/hwmon/s3c-hwmon.c |    7 ++-----
>> >>  1 files changed, 2 insertions(+), 5 deletions(-)
>> >>
>> >
>> > I'm afraid Guenter was faster:
>> >
>> > http://git.kernel.org/?p=linux/kernel/git/groeck/linux-staging.git;a=commitdiff;h=6f66b055060eee17b4c0c18f2d5c1efa04682e11
>>
>> Oops.. :)
>> I did not find it in the linux-next tree.. hence was not aware..
>>
> No problem.
>
> I have around 50 or so of those patches still pending in my -staging tree,
> because I did not get an Acked-by or Reviewed-by.
>
> Given that, your patch is fine ... it gives me a second Signed-off, so I can
> push it forward.

Thanks.

I have also submitted another patch [1]. I referred to the staging
tree pointed to by Jean and found that this patch was missing in your
tree.
Please feel free to carry it in your series if you find it ok.


[1] http://lists.lm-sensors.org/pipermail/lm-sensors/2012-July/036706.html


>
> Thanks,
> Guenter
Guenter Roeck July 13, 2012, 3:01 p.m. | #5
On Fri, Jul 13, 2012 at 02:36:28PM +0530, Sachin Kamat wrote:
> This makes the code simpler as explicit freeing is not needed.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---

Applied to -next (and dropped my own patch).

Thanks,
Guenter

Patch

diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c
index f6c26d1..b7975f8 100644
--- a/drivers/hwmon/s3c-hwmon.c
+++ b/drivers/hwmon/s3c-hwmon.c
@@ -288,7 +288,7 @@  static int __devinit s3c_hwmon_probe(struct platform_device *dev)
 		return -EINVAL;
 	}
 
-	hwmon = kzalloc(sizeof(struct s3c_hwmon), GFP_KERNEL);
+	hwmon = devm_kzalloc(&dev->dev, sizeof(struct s3c_hwmon), GFP_KERNEL);
 	if (hwmon == NULL) {
 		dev_err(&dev->dev, "no memory\n");
 		return -ENOMEM;
@@ -303,8 +303,7 @@  static int __devinit s3c_hwmon_probe(struct platform_device *dev)
 	hwmon->client = s3c_adc_register(dev, NULL, NULL, 0);
 	if (IS_ERR(hwmon->client)) {
 		dev_err(&dev->dev, "cannot register adc\n");
-		ret = PTR_ERR(hwmon->client);
-		goto err_mem;
+		return PTR_ERR(hwmon->client);
 	}
 
 	/* add attributes for our adc devices. */
@@ -363,8 +362,6 @@  static int __devinit s3c_hwmon_probe(struct platform_device *dev)
  err_registered:
 	s3c_adc_release(hwmon->client);
 
- err_mem:
-	kfree(hwmon);
 	return ret;
 }