media: staging: atomisp: Remove ->gpio_ctrl() callback
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 27 Sep 2017 18:25:02 +0000 (14:25 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 31 Oct 2017 10:21:20 +0000 (06:21 -0400)
There is redundant callback which does nothing in upstreamed version of
the driver.

Remove it along with user call places.

Mostly done with help of coccinelle.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
drivers/staging/media/atomisp/i2c/ov8858.c
drivers/staging/media/atomisp/include/linux/atomisp_platform.h

index 5fd4e94..70cc041 100644 (file)
@@ -771,10 +771,6 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (!dev || !dev->platform_data)
                return -ENODEV;
 
-       /* Non-gmin platforms use the legacy callback */
-       if (dev->platform_data->gpio_ctrl)
-               return dev->platform_data->gpio_ctrl(sd, flag);
-
        /* GPIO0 == "reset" (active low), GPIO1 == "power down" */
        if (flag) {
                /* Pulse reset, then release power down */
index aa6bde6..9a97db6 100644 (file)
@@ -571,10 +571,6 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (!dev || !dev->platform_data)
                return -ENODEV;
 
-       /* Non-gmin platforms use the legacy callback */
-       if (dev->platform_data->gpio_ctrl)
-               return dev->platform_data->gpio_ctrl(sd, flag);
-
        ret |= dev->platform_data->gpio1_ctrl(sd, !flag);
        usleep_range(60, 90);
        return dev->platform_data->gpio0_ctrl(sd, flag);
index cd4765e..81f90bc 100644 (file)
@@ -480,10 +480,6 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (!dev || !dev->platform_data)
                return -ENODEV;
 
-       /* Non-gmin platforms use the legacy callback */
-       if (dev->platform_data->gpio_ctrl)
-               return dev->platform_data->gpio_ctrl(sd, flag);
-
        /* Note: current modules wire only one GPIO signal (RESET#),
         * but the schematic wires up two to the connector.  BIOS
         * versions have been unfortunately inconsistent with which
index d44d4d4..041e30f 100644 (file)
@@ -871,10 +871,6 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (!dev || !dev->platform_data)
                return -ENODEV;
 
-       /* Non-gmin platforms use the legacy callback */
-       if (dev->platform_data->gpio_ctrl)
-               return dev->platform_data->gpio_ctrl(sd, flag);
-
        /* The OV2680 documents only one GPIO input (#XSHUTDN), but
         * existing integrations often wire two (reset/power_down)
         * because that is the way other sensors work.  There is no
index d1f149e..80f6aa0 100644 (file)
@@ -677,10 +677,6 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (!dev || !dev->platform_data)
                return -ENODEV;
 
-       /* Non-gmin platforms use the legacy callback */
-       if (dev->platform_data->gpio_ctrl)
-               return dev->platform_data->gpio_ctrl(sd, flag);
-
        /* Note: the GPIO order is asymmetric: always RESET#
         * before PWDN# when turning it on or off.
         */
index 796d33d..8091817 100644 (file)
@@ -1332,10 +1332,6 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (!dev || !dev->platform_data)
                return -ENODEV;
 
-       /* Non-gmin platforms use the legacy callback */
-       if (dev->platform_data->gpio_ctrl)
-               return dev->platform_data->gpio_ctrl(sd, flag);
-
        return dev->platform_data->gpio0_ctrl(sd, flag);
 }
 
index 10383b8..00f2ca6 100644 (file)
@@ -767,10 +767,6 @@ static int __gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (!client || !dev || !dev->platform_data)
                return -ENODEV;
 
-       /* Non-gmin platforms use the legacy callback */
-       if (dev->platform_data->gpio_ctrl)
-               return dev->platform_data->gpio_ctrl(sd, flag);
-
        if (dev->platform_data->gpio0_ctrl)
                return dev->platform_data->gpio0_ctrl(sd, flag);
 
index dbac2b7..94ddb46 100644 (file)
@@ -205,7 +205,6 @@ struct camera_vcm_control {
 };
 
 struct camera_sensor_platform_data {
-       int (*gpio_ctrl)(struct v4l2_subdev *subdev, int flag);
        int (*flisclk_ctrl)(struct v4l2_subdev *subdev, int flag);
        int (*power_ctrl)(struct v4l2_subdev *subdev, int flag);
        int (*csi_cfg)(struct v4l2_subdev *subdev, int flag);
@@ -214,7 +213,6 @@ struct camera_sensor_platform_data {
        int (*platform_deinit)(void);
        char *(*msr_file_name)(void);
        struct atomisp_camera_caps *(*get_camera_caps)(void);
-       int (*gpio_intr_ctrl)(struct v4l2_subdev *subdev);
 
        /* New G-Min power and GPIO interface, replaces
         * power/gpio_ctrl with methods to control individual