OSDN Git Service

media: ccs: Remove analogue gain field
authorSakari Ailus <sakari.ailus@linux.intel.com>
Wed, 23 Sep 2020 22:40:45 +0000 (00:40 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 12 Jan 2021 16:24:29 +0000 (17:24 +0100)
The analogue gain control was stored to the device specific struct but was
never used. Remove it.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/i2c/ccs/ccs-core.c
drivers/media/i2c/ccs/ccs.h

index 4b765ac..706fa81 100644 (file)
@@ -777,13 +777,12 @@ static int ccs_init_controls(struct ccs_sensor *sensor)
 
        sensor->pixel_array->ctrl_handler.lock = &sensor->mutex;
 
-       sensor->analog_gain = v4l2_ctrl_new_std(
-               &sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops,
-               V4L2_CID_ANALOGUE_GAIN,
-               CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN),
-               CCS_LIM(sensor, ANALOG_GAIN_CODE_MAX),
-               max(CCS_LIM(sensor, ANALOG_GAIN_CODE_STEP), 1U),
-               CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN));
+       v4l2_ctrl_new_std(&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops,
+                         V4L2_CID_ANALOGUE_GAIN,
+                         CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN),
+                         CCS_LIM(sensor, ANALOG_GAIN_CODE_MAX),
+                         max(CCS_LIM(sensor, ANALOG_GAIN_CODE_STEP), 1U),
+                         CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN));
 
        if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) ==
            CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ||
index 356b87c..9fc3333 100644 (file)
@@ -262,7 +262,6 @@ struct ccs_sensor {
        unsigned long *valid_link_freqs;
 
        /* Pixel array controls */
-       struct v4l2_ctrl *analog_gain;
        struct v4l2_ctrl *exposure;
        struct v4l2_ctrl *hflip;
        struct v4l2_ctrl *vflip;