[v2,096/106] ccs: Remove analogue gain field

Message ID	20201007084557.25843-87-sakari.ailus@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=q2TO=DO=vger.kernel.org=linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Subject: [PATCH v2 096/106] ccs: Remove analogue gain field Date: Wed, 7 Oct 2020 11:45:47 +0300 Message-Id: <20201007084557.25843-87-sakari.ailus@linux.intel.com> In-Reply-To: <20201007084557.25843-1-sakari.ailus@linux.intel.com> References: <20201007084505.25761-1-sakari.ailus@linux.intel.com> <20201007084557.25843-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	CCS driver \| expand [v2,000/106] CCS driver [v2,001/106] smiapp: Generate CCS register definitions and limits [v2,002/106] smiapp: Use CCS register flags [v2,003/106] smiapp: Calculate CCS limit offsets and limit buffer size [v2,004/106] smiapp: Remove macros for defining registers, merge definitions [v2,005/106] smiapp: Add macros for accessing CCS registers [v2,006/106] smiapp: Use MIPI CCS version and manufacturer ID information [v2,007/106] smiapp: Read CCS limit values [v2,008/106] smiapp: Switch to CCS limits [v2,009/106] smiapp: Obtain frame descriptor from CCS limits [v2,010/106] smiapp: Use CCS limits in reading data format descriptors [v2,011/106] smiapp: Use CCS limits in reading binning capabilities [v2,012/106] smiapp: Use CCS registers [v2,013/106] smiapp: Remove quirk function for writing a single 8-bit register [v2,014/106] smiapp: Rename register access functions [v2,015/106] smiapp: Internal rename to CCS [v2,016/106] smiapp: Differentiate CCS sensors from SMIA in subdev naming [v2,017/106] smiapp: Rename as "ccs" [v2,018/106] ccs: Remove profile concept [v2,019/106] ccs: Give all subdevs a function [v2,027/106] ccs: Request for "reset" GPIO [v2,028/106] ccs: Add MIPI CCS compatible strings [v2,029/106] ccs: Remove the I²C ID table [v2,030/106] ccs: Remove remaining support for platform data [v2,031/106] ccs: Make hwcfg part of the device specific struct [v2,032/106] ccs: Fix obtaining bus information from firmware [v2,033/106] ccs: Add CCS static data parser library [v2,034/106] ccs: Combine revision number major and minor into one [v2,035/106] ccs: Read CCS static data from firmware binaries [v2,036/106] ccs: Stop reading arrays after the first zero [v2,037/106] ccs: The functions to get compose or crop rectangle never return NULL [v2,038/106] ccs: Replace somewhat harsh internal checks based on BUG with WARN_ON [v2,039/106] ccs: Refactor register reading a little [v2,040/106] ccs: Make real to integer number conversion optional [v2,041/106] ccs: Move limit value real to integer conversion from read to access time [v2,042/106] ccs: Read ireal numbers correctly [v2,043/106] smiapp-pll: Rename as ccs-pll [v2,020/106] dt-bindings: nokia,smia: Fix link-frequencies documentation [v2,044/106] ccs-pll: Fix MODULE_LICENSE [v2,021/106] dt-bindings: nokia,smia: Make vana-supply optional [v2,045/106] ccs: Change my e-mail address [v2,022/106] dt-bindings: nokia,smia: Remove nokia,nvm-size property [v2,046/106] ccs: Add support for manufacturer regs from sensor and module files [v2,023/106] dt-bindings: nokia,smia: Convert to YAML [v2,047/106] ccs: Use static data read-only registers [v2,024/106] dt-bindings: nokia,smia: Use better active polarity for reset [v2,048/106] ccs: Clean up runtime PM usage [v2,025/106] dt-bindings: nokia,smia: Amend SMIA bindings with MIPI CCS support [v2,049/106] ccs: Wrap long lines, unwrap short ones [v2,026/106] dt-bindings: mipi-ccs: Add bus-type for C-PHY support [v2,050/106] ccs: Add device compatible identifiers for telling SMIA and CCS apart [v2,051/106] ccs: Use longer pre-I²C sleep for CCS compliant devices [v2,053/106] dt-bindings: mipi,ccs: Don't mention vana voltage [v2,052/106] ccs: Remove unnecessary delays from power-up sequence [v2,054/106] dt-bindings: mipi,ccs: Add vcore and vio supplies [v2,055/106] ccs: Use all regulators [v2,056/106] ccs-pll: Don't use div_u64 to divide a 32-bit number [v2,057/106] ccs-pll: Split limits and PLL configuration into front and back parts [v2,058/106] ccs-pll: Use correct VT divisor for calculating VT SYS divisor [v2,059/106] ccs-pll: End search if there are no better values available [v2,060/106] ccs-pll: Remove parallel bus support [v2,061/106] ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY [v2,062/106] ccs-pll: Move the flags field down, away from 8-bit fields [v2,063/106] ccs-pll: Document the structs in the header as well as the function [v2,064/106] ccs-pll: Use the BIT macro [v2,065/106] ccs-pll: Begin calculation from OP system clock frequency [v2,066/106] ccs-pll: Fix condition for pre-PLL divider lower bound [v2,067/106] ccs-pll: Avoid overflow in pre-PLL divisor lower bound search [v2,068/106] ccs-pll: Fix comment on check against maximum PLL multiplier [v2,069/106] ccs-pll: Fix check for PLL multiplier upper bound [v2,070/106] ccs-pll: Use explicit 32-bit unsigned type [v2,071/106] ccs-pll: Add support for lane speed model [v2,072/106] ccs: Add support for lane speed model [v2,073/106] ccs-pll: Add support for decoupled OP domain calculation [v2,074/106] ccs-pll: Add support for extended input PLL clock divider [v2,075/106] ccs-pll: Support two cycles per pixel on OP domain [v2,076/106] ccs-pll: Add support flexible OP PLL pixel clock divider [v2,077/106] ccs-pll: Add sanity checks [v2,078/106] ccs-pll: Add C-PHY support [v2,079/106] ccs-pll: Split off VT subtree calculation [v2,080/106] ccs-pll: Check for derating and overrating, support non-derating sensors [v2,081/106] ccs-pll: Better separate OP and VT sub-tree calculation [v2,082/106] ccs-pll: Print relevant information on PLL tree [v2,083/106] ccs-pll: Rework bounds checks [v2,084/106] ccs-pll: Make VT divisors 16-bit [v2,085/106] ccs-pll: Fix VT post-PLL divisor calculation [v2,086/106] ccs-pll: Separate VT divisor limit calculation from the rest [v2,087/106] ccs-pll: Add trivial dual PLL support [v2,088/106] ccs: Dual PLL support [v2,089/106] ccs-pll: Add support for DDR OP system and pixel clocks [v2,090/106] ccs: Add support for DDR OP SYS and OP PIX clocks [v2,091/106] ccs: Print written register values [v2,092/106] ccs-pll: Print pixel rates [v2,093/106] ccs: Add support for obtaining C-PHY configuration from firmware [v2,094/106] ccs: Add digital gain support [v2,095/106] ccs: Add support for old-style SMIA digital gain [v2,096/106] ccs: Remove analogue gain field [v2,097/106] ccs: Only add analogue gain control if the device supports it [v2,098/106] v4l: uapi: Add user control base for CCS controls [v2,099/106] v4l: uapi: ccs: Add controls for analogue gain constants [v2,100/106] ccs: Add support for analogue gain coefficient controls [v2,101/106] v4l: uapi: ccs: Add controls for CCS alternative analogue gain [v2,102/106] ccs: Add support for alternate analogue global gain [v2,103/106] ccs: Add debug prints for MSR registers [v2,104/106] v4l: uapi: ccs: Add CCS controls for shading correction [v2,105/106] ccs: Add shading correction and luminance correction level controls [v2,106/106] ccs: Add CCS ACPI device ID

Message ID

20201007084557.25843-87-sakari.ailus@linux.intel.com (mailing list archive)

State

New, archived

Headers

From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Subject: [PATCH v2 096/106] ccs: Remove analogue gain field
Date: Wed,  7 Oct 2020 11:45:47 +0300
Message-Id: <20201007084557.25843-87-sakari.ailus@linux.intel.com>
In-Reply-To: <20201007084557.25843-1-sakari.ailus@linux.intel.com>
References: <20201007084505.25761-1-sakari.ailus@linux.intel.com>
 <20201007084557.25843-1-sakari.ailus@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

CCS driver | expand

Commit Message

Sakari Ailus Oct. 7, 2020, 8:45 a.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 b58cfb308251..6601ed8e72be 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -778,13 +778,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;

[v2,096/106] ccs: Remove analogue gain field

Commit Message

Patch