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

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / s5p-tv / sii9234_drv.c

diff --git a/drivers/media/platform/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c
index 716d4846f8bdba7cadf04e992fc36ece0ffac226..4597342cdfbe9f9bf58c23a0e6189605cf1bf313 100644 (file)
--- a/drivers/media/platform/s5p-tv/sii9234_drv.c
+++ b/drivers/media/platform/s5p-tv/sii9234_drv.c
@@ -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;
@@ -370,7 +370,6 @@ fail_pm_get:
 
 fail_pm:
        pm_runtime_disable(dev);
-       gpio_free(ctx->gpio_n_reset);
 
 fail:
        dev_err(dev, "probe failed\n");
@@ -381,11 +380,8 @@ fail:
 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");