linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mikhail Rudenko <mike.rudenko@gmail.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Jacopo Mondi <jacopo@jmondi.org>,
	Tommaso Merciai <tomm.merciai@gmail.com>,
	Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	Dave Stevenson <dave.stevenson@raspberrypi.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Mikhail Rudenko <mike.rudenko@gmail.com>,
	Kieran Bingham <kieran.bingham@ideasonboard.com>
Subject: [PATCH v4 06/20] media: i2c: ov4689: Refactor ov4689_set_ctrl
Date: Tue,  2 Apr 2024 19:45:37 +0300	[thread overview]
Message-ID: <20240402164552.19171-7-mike.rudenko@gmail.com> (raw)
In-Reply-To: <20240402164552.19171-1-mike.rudenko@gmail.com>

Introduce local variable for regmap within the ov4689_set_ctrl
function. This adjustment eliminates repetition within the function.

Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 drivers/media/i2c/ov4689.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c
index 56bf1d964e43..1bc00404f3fb 100644
--- a/drivers/media/i2c/ov4689.c
+++ b/drivers/media/i2c/ov4689.c
@@ -580,10 +580,11 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct ov4689 *ov4689 =
 		container_of(ctrl->handler, struct ov4689, ctrl_handler);
+	struct regmap *regmap = ov4689->regmap;
 	struct device *dev = ov4689->dev;
 	int sensor_gain;
 	s64 max_expo;
-	int ret;
+	int ret = 0;
 
 	/* Propagate change of current control to all related controls */
 	switch (ctrl->id) {
@@ -603,16 +604,15 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
 	switch (ctrl->id) {
 	case V4L2_CID_EXPOSURE:
 		/* 4 least significant bits of exposure are fractional part */
-		ret = cci_write(ov4689->regmap, OV4689_REG_EXPOSURE,
-				ctrl->val << 4, NULL);
+		cci_write(regmap, OV4689_REG_EXPOSURE, ctrl->val << 4, &ret);
 		break;
 	case V4L2_CID_ANALOGUE_GAIN:
 		ret = ov4689_map_gain(ov4689, ctrl->val, &sensor_gain);
-		cci_write(ov4689->regmap, OV4689_REG_GAIN, sensor_gain, &ret);
+		cci_write(regmap, OV4689_REG_GAIN, sensor_gain, &ret);
 		break;
 	case V4L2_CID_VBLANK:
-		ret = cci_write(ov4689->regmap, OV4689_REG_VTS,
-				ctrl->val + ov4689->cur_mode->height, NULL);
+		cci_write(regmap, OV4689_REG_VTS,
+			  ctrl->val + ov4689->cur_mode->height, &ret);
 		break;
 	case V4L2_CID_TEST_PATTERN:
 		ret = ov4689_enable_test_pattern(ov4689, ctrl->val);
-- 
2.44.0


  parent reply	other threads:[~2024-04-02 16:46 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-02 16:45 [PATCH v4 00/20] Omnivision OV4689 refactoring and improvements Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 01/20] media: i2c: ov4689: Clean up and annotate the register table Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 02/20] media: i2c: ov4689: Sort register definitions by address Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 03/20] media: i2c: ov4689: Fix typo in a comment Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 04/20] media: i2c: ov4689: CCI conversion Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 05/20] media: i2c: ov4689: Remove i2c_client from ov4689 struct Mikhail Rudenko
2024-04-02 16:45 ` Mikhail Rudenko [this message]
2024-04-02 16:45 ` [PATCH v4 07/20] media: i2c: ov4689: Use sub-device active state Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 08/20] media: i2c: ov4689: Enable runtime PM before registering sub-device Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 09/20] media: i2c: ov4689: Use runtime PM autosuspend Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 10/20] media: i2c: ov4689: Remove max_fps field from struct ov4689_mode Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 11/20] media: i2c: ov4689: Make horizontal blanking configurable Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 12/20] media: i2c: ov4689: Implement vflip/hflip controls Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 13/20] media: i2c: ov4689: Implement digital gain control Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 14/20] media: i2c: ov4689: Implement manual color balance controls Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 15/20] media: i2c: ov4689: Move pixel array size out of struct ov4689_mode Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 16/20] media: i2c: ov4689: Set timing registers programmatically Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 17/20] media: i2c: ov4689: Configurable analogue crop Mikhail Rudenko
2024-04-15  6:08   ` Sakari Ailus
2024-04-15 20:22     ` Mikhail Rudenko
2024-04-16  6:47       ` Sakari Ailus
2024-04-16 22:51         ` Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 18/20] media: i2c: ov4689: Eliminate struct ov4689_mode Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 19/20] media: i2c: ov4689: Refactor ov4689_s_stream Mikhail Rudenko
2024-04-02 16:45 ` [PATCH v4 20/20] media: i2c: ov4689: Implement 2x2 binning Mikhail Rudenko
2024-04-15  6:07   ` Sakari Ailus
2024-04-15 20:05     ` Mikhail Rudenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240402164552.19171-7-mike.rudenko@gmail.com \
    --to=mike.rudenko@gmail.com \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=jacopo@jmondi.org \
    --cc=kieran.bingham@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    --cc=tomm.merciai@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).