[media] media: i2c: Convert to devm_gpio_request_one()

Using the managed function the gpio_free() calls can be removed from the
probe error path and the remove handler.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index cae4f4683851..c38545419045 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2383,8 +2383,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
         }
 
         if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN) {
-                if (gpio_request_one(sensor->platform_data->xshutdown, 0,
-                                     "SMIA++ xshutdown") != 0) {
+                if (devm_gpio_request_one(&client->dev,
+                                          sensor->platform_data->xshutdown, 0,
+                                          "SMIA++ xshutdown") != 0) {
                         dev_err(&client->dev,
                                 "unable to acquire reset gpio %d\n",
                                 sensor->platform_data->xshutdown);
@@ -2393,10 +2394,8 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
         }
 
         rval = smiapp_power_on(sensor);
-        if (rval) {
-                rval = -ENODEV;
-                goto out_smiapp_power_on;
-        }
+        if (rval)
+                return -ENODEV;
 
         rval = smiapp_identify_module(subdev);
         if (rval) {
@@ -2656,11 +2655,6 @@ out_ident_release:
 
 out_power_off:
         smiapp_power_off(sensor);
-
-out_smiapp_power_on:
-        if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN)
-                gpio_free(sensor->platform_data->xshutdown);
-
         return rval;
 }
 
@@ -2858,8 +2852,6 @@ static int smiapp_remove(struct i2c_client *client)
                 v4l2_device_unregister_subdev(&sensor->ssds[i].sd);
         }
         smiapp_free_controls(sensor);
-        if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN)
-                gpio_free(sensor->platform_data->xshutdown);
 
         return 0;
 }