linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@bootlin.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	linux-media@vger.kernel.org,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Mylene Josserand <mylene.josserand@bootlin.com>,
	Hans Verkuil <hans.verkuil@cisco.com>,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	Hugues Fruchet <hugues.fruchet@st.com>,
	Loic Poulain <loic.poulain@linaro.org>,
	Samuel Bobrowicz <sam@elite-embedded.com>,
	Steve Longerbeam <slongerbeam@gmail.com>,
	Daniel Mack <daniel@zonque.org>,
	Maxime Ripard <maxime.ripard@bootlin.com>
Subject: [PATCH v3 09/12] media: ov5640: Make the return rate type more explicit
Date: Thu, 17 May 2018 10:54:02 +0200	[thread overview]
Message-ID: <20180517085405.10104-10-maxime.ripard@bootlin.com> (raw)
In-Reply-To: <20180517085405.10104-1-maxime.ripard@bootlin.com>

In the ov5640_try_frame_interval function, the ret variable actually holds
the frame rate index to use, which is represented by the enum
ov5640_frame_rate in the driver.

Make it more obvious.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 drivers/media/i2c/ov5640.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 785a692946b6..b9a8f3feed74 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -1889,8 +1889,8 @@ static int ov5640_try_frame_interval(struct ov5640_dev *sensor,
 				     u32 width, u32 height)
 {
 	const struct ov5640_mode_info *mode;
+	enum ov5640_frame_rate rate = OV5640_30_FPS;
 	u32 minfps, maxfps, fps;
-	int ret;
 
 	minfps = ov5640_framerates[OV5640_15_FPS];
 	maxfps = ov5640_framerates[OV5640_30_FPS];
@@ -1913,10 +1913,10 @@ static int ov5640_try_frame_interval(struct ov5640_dev *sensor,
 	else
 		fi->denominator = minfps;
 
-	ret = (fi->denominator == minfps) ? OV5640_15_FPS : OV5640_30_FPS;
+	rate = (fi->denominator == minfps) ? OV5640_15_FPS : OV5640_30_FPS;
 
-	mode = ov5640_find_mode(sensor, ret, width, height, false);
-	return mode ? ret : -EINVAL;
+	mode = ov5640_find_mode(sensor, rate, width, height, false);
+	return mode ? rate : -EINVAL;
 }
 
 static int ov5640_get_fmt(struct v4l2_subdev *sd,
-- 
2.17.0

  parent reply	other threads:[~2018-05-17  8:54 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-17  8:53 [PATCH v3 00/12] media: ov5640: Misc cleanup and improvements Maxime Ripard
2018-05-17  8:53 ` [PATCH v3 01/12] media: ov5640: Fix timings setup code Maxime Ripard
2018-05-18  8:32   ` Daniel Mack
2018-05-21  7:27     ` Maxime Ripard
2018-05-17  8:53 ` [PATCH v3 02/12] media: ov5640: Adjust the clock based on the expected rate Maxime Ripard
2018-05-17  8:53 ` [PATCH v3 03/12] media: ov5640: Remove the clocks registers initialization Maxime Ripard
2018-05-18 10:35   ` Daniel Mack
2018-05-19  2:42     ` Sam Bobrowicz
2018-05-19  5:52       ` Daniel Mack
2018-05-21  7:39       ` Maxime Ripard
2018-05-22 19:54         ` Maxime Ripard
2018-05-23  9:31           ` Daniel Mack
2018-05-24 14:59             ` Maxime Ripard
2018-06-01 23:05         ` Sam Bobrowicz
2018-06-04 16:22           ` Maxime Ripard
2018-06-29 13:51           ` jacopo mondi
2018-05-17  8:53 ` [PATCH v3 04/12] media: ov5640: Remove redundant defines Maxime Ripard
2018-05-17  8:53 ` [PATCH v3 05/12] media: ov5640: Remove redundant register setup Maxime Ripard
2018-05-17  8:53 ` [PATCH v3 06/12] media: ov5640: Compute the clock rate at runtime Maxime Ripard
2018-05-17  8:54 ` [PATCH v3 07/12] media: ov5640: Remove pixel clock rates Maxime Ripard
2018-05-17  8:54 ` [PATCH v3 08/12] media: ov5640: Enhance FPS handling Maxime Ripard
2018-05-17  8:54 ` Maxime Ripard [this message]
2018-05-17  8:54 ` [PATCH v3 10/12] media: ov5640: Make the FPS clamping / rounding more extendable Maxime Ripard
2018-05-17  8:54 ` [PATCH v3 11/12] media: ov5640: Add 60 fps support Maxime Ripard
2018-05-17  8:54 ` [PATCH v3 12/12] media: ov5640: Remove duplicate auto-exposure setup Maxime Ripard
2018-05-17  9:24 ` [PATCH v3 00/12] media: ov5640: Misc cleanup and improvements Daniel Mack
2018-05-17 11:22   ` Maxime Ripard
2018-05-17 11:30     ` Sakari Ailus
2018-09-27 15:59 ` Hugues FRUCHET
2018-09-28 16:05   ` Maxime Ripard
2018-10-01 14:12     ` Hugues FRUCHET
2018-10-04 15:04       ` Maxime Ripard
2018-10-04 15:17         ` Hugues FRUCHET

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=20180517085405.10104-10-maxime.ripard@bootlin.com \
    --to=maxime.ripard@bootlin.com \
    --cc=daniel@zonque.org \
    --cc=hans.verkuil@cisco.com \
    --cc=hugues.fruchet@st.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=loic.poulain@linaro.org \
    --cc=mchehab@kernel.org \
    --cc=mylene.josserand@bootlin.com \
    --cc=sakari.ailus@linux.intel.com \
    --cc=sam@elite-embedded.com \
    --cc=slongerbeam@gmail.com \
    --cc=thomas.petazzoni@bootlin.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).