From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
linux-media@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
"Ulrich Hecht" <uli+renesas@fpond.eu>
Subject: [PATCH v3 7/8] rcar-vin: Fold rvin_initialize_device() into rvin_open()
Date: Thu, 13 Jun 2019 01:45:46 +0200 [thread overview]
Message-ID: <20190612234547.14486-8-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20190612234547.14486-1-niklas.soderlund+renesas@ragnatech.se>
The function no longer serve a purpose as most tasks it performed have
been refactored, fold what remains of it into the only caller. While at
it add error checking for v4l2_ctrl_handler_setup().
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
---
drivers/media/platform/rcar-vin/rcar-v4l2.c | 24 +++++++--------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index 5a01b617c87dccf1..a84a07f1588cc818 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -762,20 +762,6 @@ static int rvin_power_parallel(struct rvin_dev *vin, bool on)
return 0;
}
-static int rvin_initialize_device(struct file *file)
-{
- struct rvin_dev *vin = video_drvdata(file);
- int ret;
-
- ret = rvin_power_parallel(vin, true);
- if (ret < 0)
- return ret;
-
- v4l2_ctrl_handler_setup(&vin->ctrl_handler);
-
- return 0;
-}
-
static int rvin_open(struct file *file)
{
struct rvin_dev *vin = video_drvdata(file);
@@ -796,14 +782,20 @@ static int rvin_open(struct file *file)
goto err_unlock;
if (v4l2_fh_is_singular_file(file)) {
- ret = rvin_initialize_device(file);
- if (ret)
+ ret = rvin_power_parallel(vin, true);
+ if (ret < 0)
goto err_open;
+
+ ret = v4l2_ctrl_handler_setup(&vin->ctrl_handler);
+ if (ret)
+ goto err_parallel;
}
mutex_unlock(&vin->lock);
return 0;
+err_parallel:
+ rvin_power_parallel(vin, false);
err_open:
v4l2_fh_release(file);
err_unlock:
--
2.21.0
next prev parent reply other threads:[~2019-06-13 17:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 23:45 [PATCH v3 0/8] rcar-vin: Merge Gen2 and Gen3 file operations Niklas Söderlund
2019-06-12 23:45 ` [PATCH v3 1/8] rcar-vin: Do not call pm_runtime_{resume,suspend}() Niklas Söderlund
2019-06-12 23:45 ` [PATCH v3 2/8] rcar-vin: Remove unneeded calls to pm_runtime_{enable,disable} Niklas Söderlund
2019-06-12 23:45 ` [PATCH v3 3/8] rcar-vin: Allow interrupting lock when trying to open the video device Niklas Söderlund
2019-06-12 23:45 ` [PATCH v3 4/8] rcar-vin: Do not sync subdevice format when opening " Niklas Söderlund
2019-06-12 23:45 ` [PATCH v3 5/8] rcar-vin: Move pm_runtime_{get,put} out of helpers Niklas Söderlund
2019-06-12 23:45 ` [PATCH v3 6/8] rcar-vin: Merge helpers dealing with powering the parallel subdevice Niklas Söderlund
2019-06-12 23:45 ` Niklas Söderlund [this message]
2019-06-12 23:45 ` [PATCH v3 8/8] rcar-vin: Merge Gen2 and Gen3 file operations Niklas Söderlund
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=20190612234547.14486-8-niklas.soderlund+renesas@ragnatech.se \
--to=niklas.soderlund+renesas@ragnatech.se \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=uli+renesas@fpond.eu \
/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).