Commit f072c890 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

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: default avatarJingoo Han <jg1.han@samsung.com>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d073adc5
...@@ -82,8 +82,11 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, ...@@ -82,8 +82,11 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct backlight_properties props; 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; int ret = 0;
data = devm_kzalloc(&client->dev, sizeof(struct tosa_bl_data),
GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
...@@ -92,7 +95,7 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, ...@@ -92,7 +95,7 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight"); ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight");
if (ret) { if (ret) {
dev_dbg(&data->bl->dev, "Unable to request gpio!\n"); 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); ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
if (ret) if (ret)
...@@ -122,8 +125,6 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, ...@@ -122,8 +125,6 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
data->bl = NULL; data->bl = NULL;
err_gpio_dir: err_gpio_dir:
gpio_free(TOSA_GPIO_BL_C20MA); gpio_free(TOSA_GPIO_BL_C20MA);
err_gpio_bl:
kfree(data);
return ret; return ret;
} }
...@@ -136,8 +137,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client) ...@@ -136,8 +137,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client)
gpio_free(TOSA_GPIO_BL_C20MA); gpio_free(TOSA_GPIO_BL_C20MA);
kfree(data);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment