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

backlight: tosa_bl: use devm_gpio_request()

The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_gpio_request() for 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 402ff9a2
...@@ -92,14 +92,14 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, ...@@ -92,14 +92,14 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj; data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj;
ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight"); ret = devm_gpio_request(&client->dev, 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");
return ret; return ret;
} }
ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0); ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
if (ret) if (ret)
goto err_gpio_dir; return ret;
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
data->i2c = client; data->i2c = client;
...@@ -123,8 +123,6 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, ...@@ -123,8 +123,6 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
err_reg: err_reg:
data->bl = NULL; data->bl = NULL;
err_gpio_dir:
gpio_free(TOSA_GPIO_BL_C20MA);
return ret; return ret;
} }
...@@ -135,8 +133,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client) ...@@ -135,8 +133,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client)
backlight_device_unregister(data->bl); backlight_device_unregister(data->bl);
data->bl = NULL; data->bl = NULL;
gpio_free(TOSA_GPIO_BL_C20MA);
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