[03/24] ccs: Remove analogue gain field

Message ID	20201207211530.21180-4-sakari.ailus@linux.intel.com
State	Accepted
Commit	d36eb68a49948a7fb29c43bd5745692ede4b6d52
Headers	show Return-Path: <linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Cc: mchehab@kernel.org Subject: [PATCH 03/24] ccs: Remove analogue gain field Date: Mon, 7 Dec 2020 23:15:09 +0200 Message-Id: <20201207211530.21180-4-sakari.ailus@linux.intel.com> In-Reply-To: <20201207211530.21180-1-sakari.ailus@linux.intel.com> References: <20201207211530.21180-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/24] ccs: Add digital gain support \| expand [01/24] ccs: Add digital gain support [03/24] ccs: Remove analogue gain field [04/24] ccs: Only add analogue gain control if the device supports it [05/24] v4l: uapi: Add user control base for CCS controls [08/24] ccs: Add support for analogue gain coefficient controls [11/24] ccs: Add debug prints for MSR registers [12/24] v4l: uapi: ccs: Add CCS controls for shading correction [14/24] ccs: Get the endpoint by port rather than any next endpoint [16/24] ccs: Only do software reset if we have no hardware reset [17/24] ccs: Wait until software reset is done [18/24] ccs: Hardware requires a delay after starting the clock of lifting reset [23/24] ccs: Switch from standard integer types to kernel ones [24/24] Revert "media: ccs-pll: Fix MODULE_LICENSE"

Message ID

20201207211530.21180-4-sakari.ailus@linux.intel.com

State

Accepted

Commit

d36eb68a49948a7fb29c43bd5745692ede4b6d52

Headers

From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: mchehab@kernel.org
Subject: [PATCH 03/24] ccs: Remove analogue gain field
Date: Mon,  7 Dec 2020 23:15:09 +0200
Message-Id: <20201207211530.21180-4-sakari.ailus@linux.intel.com>
In-Reply-To: <20201207211530.21180-1-sakari.ailus@linux.intel.com>
References: <20201207211530.21180-1-sakari.ailus@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/24] ccs: Add digital gain support | expand

Commit Message

Sakari Ailus Dec. 7, 2020, 9:15 p.m. UTC

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>
---
 drivers/media/i2c/ccs/ccs-core.c | 13 ++++++-------
 drivers/media/i2c/ccs/ccs.h      |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index 4b765ac62c0c..706fa811d9b5 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -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 ||
diff --git a/drivers/media/i2c/ccs/ccs.h b/drivers/media/i2c/ccs/ccs.h
index 356b87c33405..9fc3333f6c4e 100644
--- a/drivers/media/i2c/ccs/ccs.h
+++ b/drivers/media/i2c/ccs/ccs.h
@@ -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;

[03/24] ccs: Remove analogue gain field

Commit Message

Patch