From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: Sakari Ailus <sakari.ailus@iki.fi>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
linux-media@vger.kernel.org
Cc: "Jacopo Mondi" <jacopo@jmondi.org>,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
"Jacopo Mondi" <jacopo+renesas@jmondi.org>
Subject: [PATCH v2 03/11] rcar-vin: Improve async notifier cleanup paths
Date: Fri, 9 Jul 2021 16:25:52 +0200 [thread overview]
Message-ID: <20210709142600.651718-4-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20210709142600.651718-1-niklas.soderlund+renesas@ragnatech.se>
The cleanup code for the async notifiers can be refactored to own
functions to reduce code duplication and improve readability. While at
it rename the CSI-2 initialization function _csi2_ instead of _mc_ to
match.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
drivers/media/platform/rcar-vin/rcar-core.c | 51 ++++++++++++---------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index bea3880752169344..2957fa10252fd1e0 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -383,6 +383,16 @@ static void rvin_group_put(struct rvin_dev *vin)
kref_put(&group->refcount, rvin_group_release);
}
+static void rvin_group_notifier_cleanup(struct rvin_dev *vin)
+{
+ mutex_lock(&vin->group->lock);
+ if (&vin->v4l2_dev == vin->group->notifier.v4l2_dev) {
+ v4l2_async_notifier_unregister(&vin->group->notifier);
+ v4l2_async_notifier_cleanup(&vin->group->notifier);
+ }
+ mutex_unlock(&vin->group->lock);
+}
+
/* -----------------------------------------------------------------------------
* Controls
*/
@@ -676,6 +686,12 @@ static int rvin_parallel_parse_of(struct rvin_dev *vin)
return ret;
}
+static void rvin_parallel_cleanup(struct rvin_dev *vin)
+{
+ v4l2_async_notifier_unregister(&vin->notifier);
+ v4l2_async_notifier_cleanup(&vin->notifier);
+}
+
static int rvin_parallel_init(struct rvin_dev *vin)
{
int ret;
@@ -937,7 +953,16 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)
return 0;
}
-static int rvin_mc_init(struct rvin_dev *vin)
+static void rvin_csi2_cleanup(struct rvin_dev *vin)
+{
+ if (!vin->info->use_mc)
+ return;
+
+ rvin_group_notifier_cleanup(vin);
+ rvin_group_put(vin);
+}
+
+static int rvin_csi2_init(struct rvin_dev *vin)
{
int ret;
@@ -1449,7 +1474,7 @@ static int rcar_vin_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, vin);
if (vin->info->use_mc) {
- ret = rvin_mc_init(vin);
+ ret = rvin_csi2_init(vin);
if (ret)
goto error_dma_unregister;
}
@@ -1462,20 +1487,9 @@ static int rcar_vin_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
return 0;
-
error_group_unregister:
rvin_free_controls(vin);
-
- if (vin->info->use_mc) {
- mutex_lock(&vin->group->lock);
- if (&vin->v4l2_dev == vin->group->notifier.v4l2_dev) {
- v4l2_async_notifier_unregister(&vin->group->notifier);
- v4l2_async_notifier_cleanup(&vin->group->notifier);
- }
- mutex_unlock(&vin->group->lock);
- rvin_group_put(vin);
- }
-
+ rvin_csi2_cleanup(vin);
error_dma_unregister:
rvin_dma_unregister(vin);
@@ -1490,14 +1504,9 @@ static int rcar_vin_remove(struct platform_device *pdev)
rvin_v4l2_unregister(vin);
- v4l2_async_notifier_unregister(&vin->notifier);
- v4l2_async_notifier_cleanup(&vin->notifier);
+ rvin_parallel_cleanup(vin);
- if (vin->info->use_mc) {
- v4l2_async_notifier_unregister(&vin->group->notifier);
- v4l2_async_notifier_cleanup(&vin->group->notifier);
- rvin_group_put(vin);
- }
+ rvin_csi2_cleanup(vin);
rvin_free_controls(vin);
--
2.32.0
next prev parent reply other threads:[~2021-07-09 14:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-09 14:25 [PATCH v2 00/11] rcar-vin: Add r8a779a0 support Niklas Söderlund
2021-07-09 14:25 ` [PATCH v2 01/11] rcar-vin: Refactor controls creation for video device Niklas Söderlund
2021-07-09 14:25 ` [PATCH v2 02/11] rcar-vin: Fix error paths for rvin_mc_init() Niklas Söderlund
2021-07-09 14:25 ` Niklas Söderlund [this message]
2021-07-09 14:25 ` [PATCH v2 04/11] rcar-vin: Improve reuse of parallel notifier Niklas Söderlund
2021-07-17 10:27 ` Jacopo Mondi
2021-07-09 14:25 ` [PATCH v2 05/11] rcar-vin: Rename array storing subdevice information Niklas Söderlund
2021-07-09 14:25 ` [PATCH v2 06/11] rcar-vin: Move group async notifier Niklas Söderlund
2021-07-09 14:25 ` [PATCH v2 07/11] rcar-vin: Extend group notifier DT parser to work with any port Niklas Söderlund
2021-07-09 14:25 ` [PATCH v2 08/11] rcar-vin: Create a callback to setup media links Niklas Söderlund
2021-07-17 10:26 ` Jacopo Mondi
2021-07-09 14:25 ` [PATCH v2 09/11] rcar-vin: Specify media device ops at group creation time Niklas Söderlund
2021-07-09 14:25 ` [PATCH v2 10/11] rcar-vin: Move and rename CSI-2 link notifications Niklas Söderlund
2021-07-09 14:26 ` [PATCH v2 11/11] rcar-vin: Add r8a779a0 support Niklas Söderlund
2021-07-21 6:39 ` Hans Verkuil
2021-07-21 8:53 ` [PATCH v2.1 " Niklas Söderlund
2021-07-26 16:05 ` Sakari Ailus
2021-07-27 7:46 ` 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=20210709142600.651718-4-niklas.soderlund+renesas@ragnatech.se \
--to=niklas.soderlund+renesas@ragnatech.se \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jacopo+renesas@jmondi.org \
--cc=jacopo@jmondi.org \
--cc=linux-media@vger.kernel.org \
--cc=sakari.ailus@iki.fi \
/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).