media: staging: atomisp: Remove Gmin dead code #1

struct camera_af_platform_data and bound functions are not used anywhere.

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/include/linux/atomisp_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
index a8c1825e1d0db17597132f5a26329893642dddc7..2dae4935ed75f1a6c2f5c8b2a4e1346a1d43bebc 100644 (file)
--- a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
@@ -221,12 +221,6 @@ struct camera_sensor_platform_data {
                                                    char *module_id);
 };
 
-struct camera_af_platform_data {
-       int (*power_ctrl)(struct v4l2_subdev *subdev, int flag);
-};
-
-const struct camera_af_platform_data *camera_get_af_platform_data(void);
-
 struct camera_mipi_info {
        enum atomisp_camera_port        port;
        unsigned int                    num_lanes;

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 129608a7b79224e6bb1a2f47f0d6d9001a6c6bd4..bf9f34b7ad72946fc67e203e0cae62d795131fc1 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
@@ -106,49 +106,6 @@ const struct atomisp_platform_data *atomisp_get_platform_data(void)
 }
 EXPORT_SYMBOL_GPL(atomisp_get_platform_data);
 
-static int af_power_ctrl(struct v4l2_subdev *subdev, int flag)
-{
-       struct gmin_subdev *gs = find_gmin_subdev(subdev);
-
-       if (gs && gs->v2p8_vcm_on == flag)
-               return 0;
-       gs->v2p8_vcm_on = flag;
-
-       /*
-        * The power here is used for dw9817,
-        * regulator is from rear sensor
-        */
-       if (gs->v2p8_vcm_reg) {
-               if (flag)
-                       return regulator_enable(gs->v2p8_vcm_reg);
-               else
-                       return regulator_disable(gs->v2p8_vcm_reg);
-       }
-       return 0;
-}
-
-/*
- * Used in a handful of modules.  Focus motor control, I think.  Note
- * that there is no configurability in the API, so this needs to be
- * fixed where it is used.
- *
- * struct camera_af_platform_data {
- *     int (*power_ctrl)(struct v4l2_subdev *subdev, int flag);
- * };
- *
- * Note that the implementation in MCG platform_camera.c is stubbed
- * out anyway (i.e. returns zero from the callback) on BYT.  So
- * neither needed on gmin platforms or supported upstream.
- */
-const struct camera_af_platform_data *camera_get_af_platform_data(void)
-{
-       static struct camera_af_platform_data afpd = {
-               .power_ctrl = af_power_ctrl,
-       };
-       return &afpd;
-}
-EXPORT_SYMBOL_GPL(camera_get_af_platform_data);
-
 int atomisp_register_i2c_module(struct v4l2_subdev *subdev,
                                struct camera_sensor_platform_data *plat_data,
                                enum intel_v4l2_subdev_type type)