[v1,12/12] media: i2c: imx219: Drop IMX219_VTS_* macros

Message ID	20230815182431.18409-13-laurent.pinchart@ideasonboard.com
State	Accepted
Commit	5ebbdd7aab3321e60a8be23aac1fee4f16644021
Headers	show Return-Path: <linux-media-owner@vger.kernel.org> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: linux-media@vger.kernel.org Cc: Sakari Ailus <sakari.ailus@iki.fi>, Dave Stevenson <dave.stevenson@raspberrypi.com>, Jacopo Mondi <jacopo.mondi@ideasonboard.com>, Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>, Hans de Goede <hdegoede@redhat.com> Subject: [PATCH v1 12/12] media: i2c: imx219: Drop IMX219_VTS_* macros Date: Tue, 15 Aug 2023 21:24:31 +0300 Message-ID: <20230815182431.18409-13-laurent.pinchart@ideasonboard.com> In-Reply-To: <20230815182431.18409-1-laurent.pinchart@ideasonboard.com> References: <20230815182431.18409-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	media: i2c: imx219: Miscellaneous cleanups and improvements \| expand [v1,00/12] media: i2c: imx219: Miscellaneous cleanups and improvements [v1,01/12] media: i2c: imx219: Convert to CCI register access helpers [v1,02/12] media: i2c: imx219: Drop unused macros [v1,03/12] media: i2c: imx219: Replace register addresses with macros [v1,04/12] media: i2c: imx219: Fix test pattern window for 640x480 mode [v1,05/12] media: i2c: imx219: Set mode registers programmatically [v1,06/12] media: i2c: imx219: Merge format and binning setting functions [v1,07/12] media: i2c: imx219: Initialize ycbcr_enc [v1,08/12] media: i2c: imx219: Use active crop rectangle to configure registers [v1,09/12] media: i2c: imx219: Infer binning settings from format and crop [v1,10/12] media: i2c: imx219: Access height from active format in imx219_set_ctrl [v1,11/12] media: i2c: imx219: Don't store the current mode in the imx219 structure [v1,12/12] media: i2c: imx219: Drop IMX219_VTS_* macros

Message ID

20230815182431.18409-13-laurent.pinchart@ideasonboard.com

State

Accepted

Commit

5ebbdd7aab3321e60a8be23aac1fee4f16644021

Headers

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: linux-media@vger.kernel.org
Cc: Sakari Ailus <sakari.ailus@iki.fi>,
        Dave Stevenson <dave.stevenson@raspberrypi.com>,
        Jacopo Mondi <jacopo.mondi@ideasonboard.com>,
        Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>,
        Hans de Goede <hdegoede@redhat.com>
Subject: [PATCH v1 12/12] media: i2c: imx219: Drop IMX219_VTS_* macros
Date: Tue, 15 Aug 2023 21:24:31 +0300
Message-ID: <20230815182431.18409-13-laurent.pinchart@ideasonboard.com>
In-Reply-To: <20230815182431.18409-1-laurent.pinchart@ideasonboard.com>
References: <20230815182431.18409-1-laurent.pinchart@ideasonboard.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

media: i2c: imx219: Miscellaneous cleanups and improvements | expand

Commit Message

Laurent Pinchart Aug. 15, 2023, 6:24 p.m. UTC

The IMX219_VTS_* macros define default VTS values for the modes
supported by the driver. They are used in a single place, and hinder
readability compared to using the value directly as a decimal number.
Drop them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/i2c/imx219.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
index c9c68a0f3b46..3a742716ddd6 100644
--- a/drivers/media/i2c/imx219.c
+++ b/drivers/media/i2c/imx219.c
@@ -71,10 +71,6 @@ 
 
 /* V_TIMING internal */
 #define IMX219_REG_VTS			CCI_REG16(0x0160)
-#define IMX219_VTS_15FPS		0x0dc6
-#define IMX219_VTS_30FPS_1080P		0x06e3
-#define IMX219_VTS_30FPS_BINNED		0x06e3
-#define IMX219_VTS_30FPS_640x480	0x06e3
 #define IMX219_VTS_MAX			0xffff
 
 #define IMX219_VBLANK_MIN		4
@@ -302,7 +298,7 @@  static const struct imx219_mode supported_modes[] = {
 			.width = 3280,
 			.height = 2464
 		},
-		.vts_def = IMX219_VTS_15FPS,
+		.vts_def = 3526,
 	},
 	{
 		/* 1080P 30fps cropped */
@@ -314,7 +310,7 @@  static const struct imx219_mode supported_modes[] = {
 			.width = 1920,
 			.height = 1080
 		},
-		.vts_def = IMX219_VTS_30FPS_1080P,
+		.vts_def = 1763,
 	},
 	{
 		/* 2x2 binned 30fps mode */
@@ -326,7 +322,7 @@  static const struct imx219_mode supported_modes[] = {
 			.width = 3280,
 			.height = 2464
 		},
-		.vts_def = IMX219_VTS_30FPS_BINNED,
+		.vts_def = 1763,
 	},
 	{
 		/* 640x480 30fps mode */
@@ -338,7 +334,7 @@  static const struct imx219_mode supported_modes[] = {
 			.width = 1280,
 			.height = 960
 		},
-		.vts_def = IMX219_VTS_30FPS_640x480,
+		.vts_def = 1763,
 	},
 };

[v1,12/12] media: i2c: imx219: Drop IMX219_VTS_* macros

Commit Message

Patch