All of lore.kernel.org
 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>, Jacopo Mondi <jacopo@jmondi.org>,
	Maxime Ripard <maxime.ripard@bootlin.com>
Subject: [PATCH v5 08/11] media: ov5640: Make the return rate type more explicit
Date: Tue, 13 Nov 2018 14:03:22 +0100	[thread overview]
Message-ID: <20181113130325.28975-9-maxime.ripard@bootlin.com> (raw)
In-Reply-To: <20181113130325.28975-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 be047dd7fbfc..fc2e03193da6 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -2052,8 +2052,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];
@@ -2076,10 +2076,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.19.1

  parent reply	other threads:[~2018-11-13 23:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-13 13:03 [PATCH v5 00/11] media: ov5640: Misc cleanup and improvements Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 01/11] media: ov5640: Adjust the clock based on the expected rate Maxime Ripard
2018-11-14 13:20   ` Adam Ford
2018-11-19 15:03     ` Adam Ford
2018-11-14 19:48   ` jacopo mondi
2018-11-20  9:48     ` Maxime Ripard
2018-11-20 16:51       ` jacopo mondi
2018-11-13 13:03 ` [PATCH v5 02/11] media: ov5640: Remove the clocks registers initialization Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 03/11] media: ov5640: Remove redundant defines Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 04/11] media: ov5640: Remove redundant register setup Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 05/11] media: ov5640: Compute the clock rate at runtime Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 06/11] media: ov5640: Remove pixel clock rates Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 07/11] media: ov5640: Enhance FPS handling Maxime Ripard
2018-11-13 13:03 ` Maxime Ripard [this message]
2018-11-13 13:03 ` [PATCH v5 09/11] media: ov5640: Make the FPS clamping / rounding more extendable Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 10/11] media: ov5640: Add 60 fps support Maxime Ripard
2018-11-13 13:03 ` [PATCH v5 11/11] media: ov5640: Remove duplicate auto-exposure setup Maxime Ripard

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=20181113130325.28975-9-maxime.ripard@bootlin.com \
    --to=maxime.ripard@bootlin.com \
    --cc=daniel@zonque.org \
    --cc=hans.verkuil@cisco.com \
    --cc=hugues.fruchet@st.com \
    --cc=jacopo@jmondi.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.