Skip to content

Commit

Permalink
[media] s5p-tv: Use devm_gpio_request in sii9234_drv.c
Browse files Browse the repository at this point in the history
devm_gpio_request is a device managed function and will make
error handling and cleanup a bit simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Sachin Kamat authored and Mauro Carvalho Chehab committed Dec 26, 2012
1 parent 341068f commit 899a179
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/media/platform/s5p-tv/sii9234_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ static int __devinit sii9234_probe(struct i2c_client *client,
}

ctx->gpio_n_reset = pdata->gpio_n_reset;
ret = gpio_request(ctx->gpio_n_reset, "MHL_RST");
ret = devm_gpio_request(dev, ctx->gpio_n_reset, "MHL_RST");
if (ret) {
dev_err(dev, "failed to acquire MHL_RST gpio\n");
return ret;
Expand Down Expand Up @@ -370,7 +370,6 @@ static int __devinit sii9234_probe(struct i2c_client *client,

fail_pm:
pm_runtime_disable(dev);
gpio_free(ctx->gpio_n_reset);

fail:
dev_err(dev, "probe failed\n");
Expand All @@ -381,11 +380,8 @@ static int __devinit sii9234_probe(struct i2c_client *client,
static int __devexit sii9234_remove(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct v4l2_subdev *sd = i2c_get_clientdata(client);
struct sii9234_context *ctx = sd_to_context(sd);

pm_runtime_disable(dev);
gpio_free(ctx->gpio_n_reset);

dev_info(dev, "remove successful\n");

Expand Down

0 comments on commit 899a179

Please sign in to comment.