From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: linux-media@vger.kernel.org Cc: Dafna Hirschfeld <dafna@fastmail.com>, Heiko Stuebner <heiko@sntech.de>, Paul Elder <paul.elder@ideasonboard.com>, Tomasz Figa <tfiga@google.com>, linux-rockchip@lists.infradead.org Subject: [PATCH v4 06/21] media: rkisp1: stats: Simplify (un)registration Date: Fri, 22 Apr 2022 02:42:25 +0300 [thread overview] Message-ID: <20220421234240.1694-7-laurent.pinchart@ideasonboard.com> (raw) In-Reply-To: <20220421234240.1694-1-laurent.pinchart@ideasonboard.com> Simplify error handling at registration time as media_entity_cleanup() can be called on an uninitialized entity, and make rkisp1_stats_unregister() safe to be called on an unregistered stats node to prepare for simplification of error handling at probe time. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c index be5777c65bfb..26ef3bbe43d0 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c @@ -463,21 +463,21 @@ int rkisp1_stats_register(struct rkisp1_device *rkisp1) node->pad.flags = MEDIA_PAD_FL_SINK; ret = media_entity_pads_init(&vdev->entity, 1, &node->pad); if (ret) - goto err_mutex_destroy; + goto error; ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (ret) { dev_err(&vdev->dev, "failed to register %s, ret=%d\n", vdev->name, ret); - goto err_cleanup_media_entity; + goto error; } return 0; -err_cleanup_media_entity: +error: media_entity_cleanup(&vdev->entity); -err_mutex_destroy: mutex_destroy(&node->vlock); + stats->rkisp1 = NULL; return ret; } @@ -487,6 +487,9 @@ void rkisp1_stats_unregister(struct rkisp1_device *rkisp1) struct rkisp1_vdev_node *node = &stats->vnode; struct video_device *vdev = &node->vdev; + if (!stats->rkisp1) + return; + vb2_video_unregister_device(vdev); media_entity_cleanup(&vdev->entity); mutex_destroy(&node->vlock); -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: linux-media@vger.kernel.org Cc: Dafna Hirschfeld <dafna@fastmail.com>, Heiko Stuebner <heiko@sntech.de>, Paul Elder <paul.elder@ideasonboard.com>, Tomasz Figa <tfiga@google.com>, linux-rockchip@lists.infradead.org Subject: [PATCH v4 06/21] media: rkisp1: stats: Simplify (un)registration Date: Fri, 22 Apr 2022 02:42:25 +0300 [thread overview] Message-ID: <20220421234240.1694-7-laurent.pinchart@ideasonboard.com> (raw) In-Reply-To: <20220421234240.1694-1-laurent.pinchart@ideasonboard.com> Simplify error handling at registration time as media_entity_cleanup() can be called on an uninitialized entity, and make rkisp1_stats_unregister() safe to be called on an unregistered stats node to prepare for simplification of error handling at probe time. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c index be5777c65bfb..26ef3bbe43d0 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c @@ -463,21 +463,21 @@ int rkisp1_stats_register(struct rkisp1_device *rkisp1) node->pad.flags = MEDIA_PAD_FL_SINK; ret = media_entity_pads_init(&vdev->entity, 1, &node->pad); if (ret) - goto err_mutex_destroy; + goto error; ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (ret) { dev_err(&vdev->dev, "failed to register %s, ret=%d\n", vdev->name, ret); - goto err_cleanup_media_entity; + goto error; } return 0; -err_cleanup_media_entity: +error: media_entity_cleanup(&vdev->entity); -err_mutex_destroy: mutex_destroy(&node->vlock); + stats->rkisp1 = NULL; return ret; } @@ -487,6 +487,9 @@ void rkisp1_stats_unregister(struct rkisp1_device *rkisp1) struct rkisp1_vdev_node *node = &stats->vnode; struct video_device *vdev = &node->vdev; + if (!stats->rkisp1) + return; + vb2_video_unregister_device(vdev); media_entity_cleanup(&vdev->entity); mutex_destroy(&node->vlock); -- Regards, Laurent Pinchart _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-04-21 23:42 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-21 23:42 [PATCH v4 00/21] media: rkisp1: Misc bug fixes and cleanups Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-21 23:42 ` [PATCH v4 01/21] media: rkisp1: capture: Initialize entity before video device Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 7:52 ` Ricardo Ribalda 2022-04-25 7:52 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 02/21] media: rkisp1: capture: Fix and simplify (un)registration Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:34 ` Ricardo Ribalda 2022-04-25 9:34 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 03/21] media: rkisp1: isp: " Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:36 ` Ricardo Ribalda 2022-04-25 9:36 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 04/21] media: rkisp1: resizer: " Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:37 ` Ricardo Ribalda 2022-04-25 9:37 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 05/21] media: rkisp1: params: " Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:39 ` Ricardo Ribalda 2022-04-25 9:39 ` Ricardo Ribalda 2022-04-21 23:42 ` Laurent Pinchart [this message] 2022-04-21 23:42 ` [PATCH v4 06/21] media: rkisp1: stats: Simplify (un)registration Laurent Pinchart 2022-04-25 9:44 ` Ricardo Ribalda 2022-04-25 9:44 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 07/21] media: rkisp1: Simplify rkisp1_entities_register() error path Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:45 ` Ricardo Ribalda 2022-04-25 9:45 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 08/21] media: rkisp1: regs: Don't use BIT() macro for multi-bit register fields Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:50 ` Ricardo Ribalda 2022-04-25 9:50 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 09/21] media: rkisp1: regs: Rename CCL, ICCL and IRCL registers with VI_ prefix Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:51 ` Ricardo Ribalda 2022-04-25 9:51 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 10/21] media: rkisp1: Swap value and address arguments to rkisp1_write() Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:53 ` Ricardo Ribalda 2022-04-25 9:53 ` Ricardo Ribalda 2022-04-25 18:59 ` Laurent Pinchart 2022-04-25 18:59 ` Laurent Pinchart 2022-04-21 23:42 ` [PATCH v4 11/21] media: rkisp1: resizer: Simplify register access Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 9:58 ` Ricardo Ribalda 2022-04-25 9:58 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 12/21] media: rkisp1: Move debugfs code to a separate file Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 10:54 ` Ricardo Ribalda 2022-04-25 10:54 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 13/21] media: rkisp1: Compile debugfs support conditionally Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 10:58 ` Ricardo Ribalda 2022-04-25 10:58 ` Ricardo Ribalda 2022-04-25 19:08 ` Laurent Pinchart 2022-04-25 19:08 ` Laurent Pinchart 2022-04-26 7:33 ` Ricardo Ribalda 2022-04-26 7:33 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 14/21] media: rkisp1: debug: Collect input status by sampling ISP_FLAGS_SHD Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 11:08 ` Ricardo Ribalda 2022-04-25 11:08 ` Ricardo Ribalda 2022-04-25 20:13 ` Laurent Pinchart 2022-04-25 20:13 ` Laurent Pinchart 2022-04-21 23:42 ` [PATCH v4 15/21] media: rkisp1: debug: Add debugfs files to dump core and ISP registers Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 11:13 ` Ricardo Ribalda 2022-04-25 11:13 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 16/21] media: rkisp1: debug: Move resizer register dump to debugfs Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 11:16 ` Ricardo Ribalda 2022-04-25 11:16 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 17/21] media: rkisp1: debug: Consolidate reg dumps for shadow registers Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 11:45 ` Ricardo Ribalda 2022-04-25 11:45 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 18/21] media: rkisp1: debug: Compute max register length name dynamically Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 11:49 ` Ricardo Ribalda 2022-04-25 11:49 ` Ricardo Ribalda 2022-04-25 19:05 ` Laurent Pinchart 2022-04-25 19:05 ` Laurent Pinchart 2022-04-25 21:01 ` [PATCH v4.1 18/21] media: rkisp1: debug: Update max register name length Laurent Pinchart 2022-04-25 21:01 ` Laurent Pinchart 2022-04-26 7:39 ` Ricardo Ribalda 2022-04-26 7:39 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 19/21] media: rkisp1: capture: Bypass the main device for handling querycap Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 11:51 ` Ricardo Ribalda 2022-04-25 11:51 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 20/21] media: rkisp1: Align macro definitions Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 11:52 ` Ricardo Ribalda 2022-04-25 11:52 ` Ricardo Ribalda 2022-04-21 23:42 ` [PATCH v4 21/21] media: rkisp1: Drop parentheses and fix indentation in rkisp1_probe() Laurent Pinchart 2022-04-21 23:42 ` Laurent Pinchart 2022-04-25 8:30 ` Ricardo Ribalda 2022-04-25 8:30 ` Ricardo Ribalda
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=20220421234240.1694-7-laurent.pinchart@ideasonboard.com \ --to=laurent.pinchart@ideasonboard.com \ --cc=dafna@fastmail.com \ --cc=heiko@sntech.de \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=paul.elder@ideasonboard.com \ --cc=tfiga@google.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: linkBe 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.