media: staging: atomisp: Remove unused members of camera_sensor_platform_data

Remove unused members along with dead code.

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 5d2fe23347a1a9a3d679f2e3bca57c674d2a7cf8..e70d8afcc2295b52d7ee98799feda592cf0b7a37 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -1156,13 +1156,6 @@ static int gc0310_s_config(struct v4l2_subdev *sd,
                (struct camera_sensor_platform_data *)platform_data;
 
        mutex_lock(&dev->input_lock);
-       if (dev->platform_data->platform_init) {
-               ret = dev->platform_data->platform_init(client);
-               if (ret) {
-                       dev_err(&client->dev, "platform init err\n");
-                       goto platform_init_failed;
-               }
-       }
        /* power off the module, then power on it in future
         * as first power on by board may not fulfill the
         * power on sequqence needed by the module
@@ -1207,9 +1200,6 @@ fail_power_on:
        power_down(sd);
        dev_err(&client->dev, "sensor power-gating failed\n");
 fail_power_off:
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
-platform_init_failed:
        mutex_unlock(&dev->input_lock);
        return ret;
 }
@@ -1353,9 +1343,6 @@ static int gc0310_remove(struct i2c_client *client)
        struct gc0310_device *dev = to_gc0310_sensor(sd);
        dev_dbg(&client->dev, "gc0310_remove...\n");
 
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
-
        dev->platform_data->csi_cfg(sd, 0);
 
        v4l2_device_unregister_subdev(sd);

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index ccbc3df92dff21b27c54e9859936ddbc53158ef3..85da5fe240339c16694f9b2acc54dbcea191efde 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -897,13 +897,6 @@ static int gc2235_s_config(struct v4l2_subdev *sd,
                (struct camera_sensor_platform_data *)platform_data;
 
        mutex_lock(&dev->input_lock);
-       if (dev->platform_data->platform_init) {
-               ret = dev->platform_data->platform_init(client);
-               if (ret) {
-                       dev_err(&client->dev, "platform init err\n");
-                       goto platform_init_failed;
-               }
-       }
        /* power off the module, then power on it in future
         * as first power on by board may not fulfill the
         * power on sequqence needed by the module
@@ -947,9 +940,6 @@ fail_power_on:
        power_down(sd);
        dev_err(&client->dev, "sensor power-gating failed\n");
 fail_power_off:
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
-platform_init_failed:
        mutex_unlock(&dev->input_lock);
        return ret;
 }
@@ -1092,9 +1082,6 @@ static int gc2235_remove(struct i2c_client *client)
        struct gc2235_device *dev = to_gc2235_sensor(sd);
        dev_dbg(&client->dev, "gc2235_remove...\n");
 
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
-
        dev->platform_data->csi_cfg(sd, 0);
 
        v4l2_device_unregister_subdev(sd);

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index 7c3ecc6f2c65b1d6c656453e2f2cbeb1b015b5a4..706eea52e36fa077d60d0d6f73cd0ddd20e9d5e7 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1575,13 +1575,6 @@ mt9m114_s_config(struct v4l2_subdev *sd, int irq, void *platform_data)
        dev->platform_data =
            (struct camera_sensor_platform_data *)platform_data;
 
-       if (dev->platform_data->platform_init) {
-               ret = dev->platform_data->platform_init(client);
-               if (ret) {
-                       v4l2_err(client, "mt9m114 platform init err\n");
-                       return ret;
-               }
-       }
        ret = power_up(sd);
        if (ret) {
                v4l2_err(client, "mt9m114 power-up err");
@@ -1835,8 +1828,6 @@ static int mt9m114_remove(struct i2c_client *client)
 
        dev = container_of(sd, struct mt9m114_device, sd);
        dev->platform_data->csi_cfg(sd, 0);
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
        v4l2_device_unregister_subdev(sd);
        media_entity_cleanup(&dev->sd.entity);
        v4l2_ctrl_handler_free(&dev->ctrl_handler);

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index 50ee36da710963414295dd4272d4692783972ce5..4df7eba8d375b0c4a1ed0b2efc4589990d8e65ac 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -1035,13 +1035,6 @@ static int ov2722_s_config(struct v4l2_subdev *sd,
                (struct camera_sensor_platform_data *)platform_data;
 
        mutex_lock(&dev->input_lock);
-       if (dev->platform_data->platform_init) {
-               ret = dev->platform_data->platform_init(client);
-               if (ret) {
-                       dev_err(&client->dev, "platform init err\n");
-                       goto platform_init_failed;
-               }
-       }
 
        /* power off the module, then power on it in future
         * as first power on by board may not fulfill the
@@ -1086,9 +1079,6 @@ fail_power_on:
        power_down(sd);
        dev_err(&client->dev, "sensor power-gating failed\n");
 fail_power_off:
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
-platform_init_failed:
        mutex_unlock(&dev->input_lock);
        return ret;
 }
@@ -1232,9 +1222,6 @@ static int ov2722_remove(struct i2c_client *client)
        struct ov2722_device *dev = to_ov2722_sensor(sd);
        dev_dbg(&client->dev, "ov2722_remove...\n");
 
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
-
        dev->platform_data->csi_cfg(sd, 0);
        v4l2_ctrl_handler_free(&dev->ctrl_handler);
        v4l2_device_unregister_subdev(sd);

diff --git a/drivers/staging/media/atomisp/i2c/ov8858.c b/drivers/staging/media/atomisp/i2c/ov8858.c
index 75f64d1a5f7762d144d7cb6432845a0285800c6a..51d65931dc03a6a517b704be2ee73339b9935cab 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov8858.c
+++ b/drivers/staging/media/atomisp/i2c/ov8858.c
@@ -1565,15 +1565,6 @@ static int ov8858_s_config(struct v4l2_subdev *sd,
 
        mutex_lock(&dev->input_lock);
 
-       if (dev->platform_data->platform_init) {
-               ret = dev->platform_data->platform_init(client);
-               if (ret) {
-                       mutex_unlock(&dev->input_lock);
-                       dev_err(&client->dev, "platform init error %d!\n", ret);
-                       return ret;
-               }
-       }
-
        ret = __ov8858_s_power(sd, 1);
        if (ret) {
                dev_err(&client->dev, "power-up error %d!\n", ret);
@@ -1618,8 +1609,6 @@ fail_detect:
 fail_csi_cfg:
        __ov8858_s_power(sd, 0);
 fail_update:
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
        mutex_unlock(&dev->input_lock);
        dev_err(&client->dev, "sensor power-gating failed\n");
        return ret;
@@ -1920,8 +1909,6 @@ static int ov8858_remove(struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct ov8858_device *dev = to_ov8858_sensor(sd);
-       if (dev->platform_data->platform_deinit)
-               dev->platform_data->platform_deinit();
 
        media_entity_cleanup(&dev->sd.entity);
        v4l2_ctrl_handler_free(&dev->ctrl_handler);

diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
index 5ce8678dacf3c92753ab11b3baab93a85b0d6a26..a8c1825e1d0db17597132f5a26329893642dddc7 100644 (file)
--- a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
@@ -207,11 +207,6 @@ struct camera_vcm_control {
 struct camera_sensor_platform_data {
        int (*flisclk_ctrl)(struct v4l2_subdev *subdev, int flag);
        int (*csi_cfg)(struct v4l2_subdev *subdev, int flag);
-       bool (*low_fps)(void);
-       int (*platform_init)(struct i2c_client *);
-       int (*platform_deinit)(void);
-       char *(*msr_file_name)(void);
-       struct atomisp_camera_caps *(*get_camera_caps)(void);
 
        /*
         * New G-Min power and GPIO interface to control individual

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
index 20aff7faf44ab24f13a52af29ee2e712b1ee27fa..6d2920155fa40252471f71ab9341d27c0f25e93c 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
@@ -750,7 +750,6 @@ static int atomisp_subdev_probe(struct atomisp_device *isp)
                        &subdevs->v4l2_subdev.board_info;
                struct i2c_adapter *adapter =
                        i2c_get_adapter(subdevs->v4l2_subdev.i2c_adapter_id);
-               struct camera_sensor_platform_data *sensor_pdata;
                int sensor_num, i;
 
                if (adapter == NULL) {
@@ -802,13 +801,7 @@ static int atomisp_subdev_probe(struct atomisp_device *isp)
                         * pixel_format.
                         */
                        isp->inputs[isp->input_cnt].frame_size.pixel_format = 0;
-                       sensor_pdata = (struct camera_sensor_platform_data *)
-                                       board_info->platform_data;
-                       if (sensor_pdata->get_camera_caps)
-                               isp->inputs[isp->input_cnt].camera_caps =
-                                       sensor_pdata->get_camera_caps();
-                       else
-                               isp->inputs[isp->input_cnt].camera_caps =
+                       isp->inputs[isp->input_cnt].camera_caps =
                                        atomisp_get_default_camera_caps();
                        sensor_num = isp->inputs[isp->input_cnt]
                                .camera_caps->sensor_num;

diff --git a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
index 704d66b83106d2119edbc5b92fd3de4c817c0c23..129608a7b79224e6bb1a2f47f0d6d9001a6c6bd4 100644 (file)
--- a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
@@ -332,16 +332,6 @@ static const struct {
 
 #define CFG_VAR_NAME_MAX 64
 
-static int gmin_platform_init(struct i2c_client *client)
-{
-       return 0;
-}
-
-static int gmin_platform_deinit(void)
-{
-       return 0;
-}
-
 #define GMIN_PMC_CLK_NAME 14 /* "pmc_plt_clk_[0..5]" */
 static char gmin_pmc_clk_name[GMIN_PMC_CLK_NAME];
 
@@ -628,8 +618,6 @@ static struct camera_sensor_platform_data gmin_plat = {
        .v2p8_ctrl = gmin_v2p8_ctrl,
        .v1p2_ctrl = gmin_v1p2_ctrl,
        .flisclk_ctrl = gmin_flisclk_ctrl,
-       .platform_init = gmin_platform_init,
-       .platform_deinit = gmin_platform_deinit,
        .csi_cfg = gmin_csi_cfg,
        .get_vcm_ctrl = gmin_get_vcm_ctrl,
 };