mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +00:00
backlight: tosa_bl: use devm_ functions
The devm_ functions allocate memory that is released when a driver detaches. This patch uses devm_kzalloc of these functions. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Cc: Dmitry Baryshkov <dbaryshkov@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d073adc5ca
commit
f072c8900c
@ -82,8 +82,11 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct backlight_properties props;
|
||||
struct tosa_bl_data *data = kzalloc(sizeof(struct tosa_bl_data), GFP_KERNEL);
|
||||
struct tosa_bl_data *data;
|
||||
int ret = 0;
|
||||
|
||||
data = devm_kzalloc(&client->dev, sizeof(struct tosa_bl_data),
|
||||
GFP_KERNEL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -92,7 +95,7 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
|
||||
ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight");
|
||||
if (ret) {
|
||||
dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
|
||||
goto err_gpio_bl;
|
||||
return ret;
|
||||
}
|
||||
ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
|
||||
if (ret)
|
||||
@ -122,8 +125,6 @@ err_reg:
|
||||
data->bl = NULL;
|
||||
err_gpio_dir:
|
||||
gpio_free(TOSA_GPIO_BL_C20MA);
|
||||
err_gpio_bl:
|
||||
kfree(data);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -136,8 +137,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client)
|
||||
|
||||
gpio_free(TOSA_GPIO_BL_C20MA);
|
||||
|
||||
kfree(data);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user