media: atomisp-ov2680: Remove a bunch of unused vars from ov2680_device

Remove a couple of variables which where either completely unused,
or only ever got a value assigned to them but were never read.

Link: https://lore.kernel.org/linux-media/20211107171549.267583-2-hdegoede@redhat.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index ef43993..56f95e4 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
@@ -166,8 +166,6 @@ static int ov2680_get_intg_factor(struct i2c_client *client,
                                  struct camera_mipi_info *info,
                                  const struct ov2680_resolution *res)
 {
-       struct v4l2_subdev *sd = i2c_get_clientdata(client);
-       struct ov2680_device *dev = to_ov2680_sensor(sd);
        struct atomisp_sensor_mode_data *buf = &info->data;
        unsigned int pix_clk_freq_hz;
        u16 reg_val;
@@ -180,7 +178,6 @@ static int ov2680_get_intg_factor(struct i2c_client *client,
        /* pixel clock */
        pix_clk_freq_hz = res->pix_clk_freq * 1000000;
 
-       dev->vt_pix_clk_freq_mhz = pix_clk_freq_hz;
        buf->vt_pix_clk_freq_mhz = pix_clk_freq_hz;
 
        /* get integration time */
@@ -434,24 +431,8 @@ err:
        return ret;
 }
 
-static u32 ov2680_translate_bayer_order(enum atomisp_bayer_order code)
-{
-       switch (code) {
-       case atomisp_bayer_order_rggb:
-               return MEDIA_BUS_FMT_SRGGB10_1X10;
-       case atomisp_bayer_order_grbg:
-               return MEDIA_BUS_FMT_SGRBG10_1X10;
-       case atomisp_bayer_order_bggr:
-               return MEDIA_BUS_FMT_SBGGR10_1X10;
-       case atomisp_bayer_order_gbrg:
-               return MEDIA_BUS_FMT_SGBRG10_1X10;
-       }
-       return 0;
-}
-
 static int ov2680_v_flip(struct v4l2_subdev *sd, s32 value)
 {
-       struct ov2680_device *dev = to_ov2680_sensor(sd);
        struct camera_mipi_info *ov2680_info = NULL;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        int ret;
@@ -476,15 +457,12 @@ static int ov2680_v_flip(struct v4l2_subdev *sd, s32 value)
        ov2680_info = v4l2_get_subdev_hostdata(sd);
        if (ov2680_info) {
                ov2680_info->raw_bayer_order = ov2680_bayer_order_mapping[index];
-               dev->format.code = ov2680_translate_bayer_order(
-                                      ov2680_info->raw_bayer_order);
        }
        return ret;
 }
 
 static int ov2680_h_flip(struct v4l2_subdev *sd, s32 value)
 {
-       struct ov2680_device *dev = to_ov2680_sensor(sd);
        struct camera_mipi_info *ov2680_info = NULL;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        int ret;
@@ -510,8 +488,6 @@ static int ov2680_h_flip(struct v4l2_subdev *sd, s32 value)
        ov2680_info = v4l2_get_subdev_hostdata(sd);
        if (ov2680_info) {
                ov2680_info->raw_bayer_order = ov2680_bayer_order_mapping[index];
-               dev->format.code = ov2680_translate_bayer_order(
-                                      ov2680_info->raw_bayer_order);
        }
        return ret;
 }
@@ -1199,7 +1175,6 @@ static int ov2680_probe(struct i2c_client *client)
 
        dev->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
        dev->pad.flags = MEDIA_PAD_FL_SOURCE;
-       dev->format.code = MEDIA_BUS_FMT_SBGGR10_1X10;
        dev->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
        ret =
            v4l2_ctrl_handler_init(&dev->ctrl_handler,

diff --git a/drivers/staging/media/atomisp/i2c/ov2680.h b/drivers/staging/media/atomisp/i2c/ov2680.h
index 535440e..9f9f669 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov2680.h
+++ b/drivers/staging/media/atomisp/i2c/ov2680.h
@@ -169,14 +169,10 @@ struct ov2680_format {
 struct ov2680_device {
        struct v4l2_subdev sd;
        struct media_pad pad;
-       struct v4l2_mbus_framefmt format;
        struct mutex input_lock;
        struct v4l2_ctrl_handler ctrl_handler;
        struct ov2680_resolution *res;
        struct camera_sensor_platform_data *platform_data;
-       int vt_pix_clk_freq_mhz;
-       int run_mode;
-       u8 type;
 };
 
 /**