Re: [PATCH 02/13] backlight: adp8870: use devm_ functions

[Michael Hennerich]

On 05/25/2012 04:17 AM, Jingoo Han wrote:
> The devm_ functions allocate memory that is released when a driver
> detaches. This patch uses devm_kzalloc of these functions.
>
> Cc: Michael Hennerich<michael.hennerich@xxxxxxxxxx>
> Cc: Richard Purdie<rpurdie@xxxxxxxxx>
> Signed-off-by: Jingoo Han<jg1.han@xxxxxxxxxxx>
Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
> ---
>   drivers/video/backlight/adp8870_bl.c |   22 +++++++---------------
>   1 files changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
> index 9be58c6..32c025f 100644
> --- a/drivers/video/backlight/adp8870_bl.c
> +++ b/drivers/video/backlight/adp8870_bl.c
> @@ -244,8 +244,8 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
>   	struct led_info *cur_led;
>   	int ret, i;
>
> -
> -	led = kcalloc(pdata->num_leds, sizeof(*led), GFP_KERNEL);
> +	led = devm_kzalloc(&client->dev, pdata->num_leds * sizeof(*led),
> +				GFP_KERNEL);
>   	if (led == NULL) {
>   		dev_err(&client->dev, "failed to alloc memory\n");
>   		return -ENOMEM;
> @@ -253,17 +253,17 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
>
>   	ret = adp8870_write(client, ADP8870_ISCLAW, pdata->led_fade_law);
>   	if (ret)
> -		goto err_free;
> +		return ret;
>
>   	ret = adp8870_write(client, ADP8870_ISCT1,
>   			(pdata->led_on_time&  0x3)<<  6);
>   	if (ret)
> -		goto err_free;
> +		return ret;
>
>   	ret = adp8870_write(client, ADP8870_ISCF,
>   			FADE_VAL(pdata->led_fade_in, pdata->led_fade_out));
>   	if (ret)
> -		goto err_free;
> +		return ret;
>
>   	for (i = 0; i<  pdata->num_leds; ++i) {
>   		cur_led =&pdata->leds[i];
> @@ -317,9 +317,6 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
>   		cancel_work_sync(&led[i].work);
>   	}
>
> - err_free:
> -	kfree(led);
> -
>   	return ret;
>   }
>
> @@ -335,7 +332,6 @@ static int __devexit adp8870_led_remove(struct i2c_client *client)
>   		cancel_work_sync(&data->led[i].work);
>   	}
>
> -	kfree(data->led);
>   	return 0;
>   }
>   #else
> @@ -874,7 +870,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
>   		return -ENODEV;
>   	}
>
> -	data = kzalloc(sizeof(*data), GFP_KERNEL);
> +	data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
>   	if (data == NULL)
>   		return -ENOMEM;
>
> @@ -894,8 +890,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
>   			&client->dev, data,&adp8870_bl_ops,&props);
>   	if (IS_ERR(bl)) {
>   		dev_err(&client->dev, "failed to register backlight\n");
> -		ret = PTR_ERR(bl);
> -		goto out2;
> +		return PTR_ERR(bl);
>   	}
>
>   	data->bl = bl;
> @@ -930,8 +925,6 @@ out:
>   			&adp8870_bl_attr_group);
>   out1:
>   	backlight_device_unregister(bl);
> -out2:
> -	kfree(data);
>
>   	return ret;
>   }
> @@ -950,7 +943,6 @@ static int __devexit adp8870_remove(struct i2c_client *client)
>   			&adp8870_bl_attr_group);
>
>   	backlight_device_unregister(data->bl);
> -	kfree(data);
>
>   	return 0;
>   }


--
Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif


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