media: staging: atomisp: Remove ->gpio_ctrl() callback

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>

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
index 5fd4e9486a9961e9d7b57d0d620e4ef4d7712646..70cc041f549cfa3ec63512b7f5c83840b86a467c 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -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 */

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index aa6bde6d4d01f8ae090b342d89f697a2c5d09ad4..9a97db696f55ad86c64eb6ce11374343bc999d1f 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -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);

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index cd4765e2cc23d0a5ff86c07964dfe48bb7d4a6a6..81f90bc3f4e20a6d828ee3a91dc302d9a31e46cb 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -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

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index d44d4d4d2dee41796f112ae57d6bb492c72c8c47..041e30f758174af296b23caad51cdb782795eaa7 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
@@ -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

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index d1f149e7599a8e2336150d90f0d3371923d580f3..80f6aa0472ce2889465917759e2ffb871c0fc27c 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -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.
         */

diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
index 796d33de2f08a1d886dde9039be5b70062fdd0ca..8091817dead649156b567d9d6113b9ff7d071883 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
@@ -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);
 }
 

diff --git a/drivers/staging/media/atomisp/i2c/ov8858.c b/drivers/staging/media/atomisp/i2c/ov8858.c
index 10383b8b6ecb4867c88d0fd10e8461cf6ec6c979..00f2ca6ab93966c839f26c4f886754513d99d41f 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov8858.c
+++ b/drivers/staging/media/atomisp/i2c/ov8858.c
@@ -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);
 

diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
index dbac2b777dad0c3a01953110a5831672dcda4f50..94ddb46d415bddbff90cf993675b09e98a0ce099 100644 (file)
--- a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
@@ -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