From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Ulrich Hecht <uli@fpond.eu>,
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 v2 7/8] rcar-vin: Fold rvin_initialize_device() into rvin_open()
Date: Thu, 16 May 2019 03:14:16 +0200 [thread overview]
Message-ID: <20190516011417.10590-8-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20190516011417.10590-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.
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 | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index 7c8ba4b310706ceb..169639416121f204 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,10 +782,11 @@ static int rvin_open(struct file *file)
goto err_pm;
if (v4l2_fh_is_singular_file(file)) {
- if (rvin_initialize_device(file)) {
- ret = -ENODEV;
+ ret = rvin_power_parallel(vin, true);
+ if (ret < 0)
goto err_open;
- }
+
+ v4l2_ctrl_handler_setup(&vin->ctrl_handler);
}
mutex_unlock(&vin->lock);
--
2.21.0
next prev parent reply other threads:[~2019-05-16 1:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 1:14 [PATCH v2 0/8] rcar-vin: Merge Gen2 and Gen3 file operations Niklas Söderlund
2019-05-16 1:14 ` [PATCH v2 1/8] rcar-vin: Do not call pm_runtime_{resume,suspend}() Niklas Söderlund
2019-05-16 7:23 ` Geert Uytterhoeven
2019-05-16 11:32 ` Laurent Pinchart
2019-05-16 1:14 ` [PATCH v2 2/8] rcar-vin: Remove unneeded calls to pm_runtime_{enable,disable} Niklas Söderlund
2019-05-16 7:27 ` Geert Uytterhoeven
2019-05-16 11:34 ` Laurent Pinchart
2019-05-16 1:14 ` [PATCH v2 3/8] rcar-vin: Allow interrupting lock when trying to open the video device Niklas Söderlund
2019-05-16 11:21 ` Laurent Pinchart
2019-05-16 1:14 ` [PATCH v2 4/8] rcar-vin: Do not sync subdevice format when opening " Niklas Söderlund
2019-05-16 11:26 ` Laurent Pinchart
2019-05-16 13:25 ` Niklas Söderlund
2019-05-16 1:14 ` [PATCH v2 5/8] rcar-vin: Move pm_runtime_{get,put} out of helpers Niklas Söderlund
2019-05-16 11:39 ` Laurent Pinchart
2019-05-16 1:14 ` [PATCH v2 6/8] rcar-vin: Merge helpers dealing with powering the parallel subdevice Niklas Söderlund
2019-05-16 7:40 ` Ulrich Hecht
2019-05-16 11:44 ` Laurent Pinchart
2019-05-16 1:14 ` Niklas Söderlund [this message]
2019-05-16 11:45 ` [PATCH v2 7/8] rcar-vin: Fold rvin_initialize_device() into rvin_open() Laurent Pinchart
2019-05-16 1:14 ` [PATCH v2 8/8] rcar-vin: Merge Gen2 and Gen3 file operations Niklas Söderlund
2019-05-16 11:48 ` Laurent Pinchart
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=20190516011417.10590-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 \
--cc=uli@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 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.