Skip to content

Commit

Permalink
backlight: tosa_bl: use devm_gpio_request()
Browse files Browse the repository at this point in the history
The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_gpio_request() for 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>
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed Jul 31, 2012
1 parent 402ff9a commit f5b7194
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/video/backlight/tosa_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight");
ret = devm_gpio_request(&client->dev, TOSA_GPIO_BL_C20MA, "backlight");
if (ret) {
dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
return ret;
}
ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
if (ret)
goto err_gpio_dir;
return ret;

i2c_set_clientdata(client, data);
data->i2c = client;
Expand All @@ -123,8 +123,6 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,

err_reg:
data->bl = NULL;
err_gpio_dir:
gpio_free(TOSA_GPIO_BL_C20MA);
return ret;
}

Expand All @@ -135,8 +133,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client)
backlight_device_unregister(data->bl);
data->bl = NULL;

gpio_free(TOSA_GPIO_BL_C20MA);

return 0;
}

Expand Down

0 comments on commit f5b7194

Please sign in to comment.