Commit 899a179d authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab

[media] s5p-tv: Use devm_gpio_request in sii9234_drv.c

devm_gpio_request is a device managed function and will make
error handling and cleanup a bit simpler.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 341068fc
...@@ -338,7 +338,7 @@ static int __devinit sii9234_probe(struct i2c_client *client, ...@@ -338,7 +338,7 @@ static int __devinit sii9234_probe(struct i2c_client *client,
} }
ctx->gpio_n_reset = pdata->gpio_n_reset; 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) { if (ret) {
dev_err(dev, "failed to acquire MHL_RST gpio\n"); dev_err(dev, "failed to acquire MHL_RST gpio\n");
return ret; return ret;
...@@ -370,7 +370,6 @@ static int __devinit sii9234_probe(struct i2c_client *client, ...@@ -370,7 +370,6 @@ static int __devinit sii9234_probe(struct i2c_client *client,
fail_pm: fail_pm:
pm_runtime_disable(dev); pm_runtime_disable(dev);
gpio_free(ctx->gpio_n_reset);
fail: fail:
dev_err(dev, "probe failed\n"); dev_err(dev, "probe failed\n");
...@@ -381,11 +380,8 @@ static int __devinit sii9234_probe(struct i2c_client *client, ...@@ -381,11 +380,8 @@ static int __devinit sii9234_probe(struct i2c_client *client,
static int __devexit sii9234_remove(struct i2c_client *client) static int __devexit sii9234_remove(struct i2c_client *client)
{ {
struct device *dev = &client->dev; 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); pm_runtime_disable(dev);
gpio_free(ctx->gpio_n_reset);
dev_info(dev, "remove successful\n"); dev_info(dev, "remove successful\n");
......
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