From patchwork Sat Jul 18 14:59:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 11671981 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 127381510 for ; Sat, 18 Jul 2020 14:59:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E004320656 for ; Sat, 18 Jul 2020 14:59:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BsA6ry5k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E004320656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EIj1MkhBEAzy2+LP3vBBBZe8EOsI8cNCZ19RUqp20Ck=; b=BsA6ry5kaS/RNO7F43Eui/oQnP E7EDRu60aH4Q9r9IKr3XXThGmzzgk3bre3JWgpDaGlaxXboYiYl1Ndn1Om10N2Q3ZD/gAiCp27FZ5 URoVprvXO8Qhw+RGjIFfyGyc95GKAMqTfXFgdoeoZSE2c/q83V+vGSmiGYVNvzU8b4xBdbo5nBCv+ hhIs1n1nkAe2zEQPyg4bWkZyU7OFS1La9OC4acjWUHECgK2A12b6VkG44L+qCSG/1TIKB5PRvqx24 Ga+MxQY6CKs6HC4Ji4E6+GwEu4c4gGJH5D37Cwkf5Y9CBNgXykKhrKYfvxFjlj9sS1YZ/FYewvEIa uFgLTuWQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwoJU-0006XY-Ur; Sat, 18 Jul 2020 14:59:45 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwoJG-0006O6-GT for linux-rockchip@lists.infradead.org; Sat, 18 Jul 2020 14:59:36 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: dafna) with ESMTPSA id 0442D2A5291 From: Dafna Hirschfeld To: linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com Subject: [PATCH v2 6/9] media: staging: rkisp1: unify (un)register functions to have the same parameters Date: Sat, 18 Jul 2020 16:59:15 +0200 Message-Id: <20200718145918.17752-7-dafna.hirschfeld@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200718145918.17752-1-dafna.hirschfeld@collabora.com> References: <20200718145918.17752-1-dafna.hirschfeld@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200718_105931_338467_189B653B X-CRM114-Status: GOOD ( 11.17 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, dafna.hirschfeld@collabora.com, dafna3@gmail.com, tfiga@chromium.org, hverkuil@xs4all.nl, linux-rockchip@lists.infradead.org, helen.koike@collabora.com, sakari.ailus@linux.intel.com, kernel@collabora.com, ezequiel@collabora.com MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org The different register/unregister functions receive different parameters. This patch unify them so they all receive just 'struct *rkisp1_device' as parameter. Signed-off-by: Dafna Hirschfeld Acked-by: Helen Koike --- drivers/staging/media/rkisp1/rkisp1-common.h | 15 +++++---------- drivers/staging/media/rkisp1/rkisp1-dev.c | 15 +++++++-------- drivers/staging/media/rkisp1/rkisp1-isp.c | 5 ++--- drivers/staging/media/rkisp1/rkisp1-params.c | 10 +++++----- drivers/staging/media/rkisp1/rkisp1-stats.c | 10 +++++----- 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h index 893caa9df891..fe1a775de768 100644 --- a/drivers/staging/media/rkisp1/rkisp1-common.h +++ b/drivers/staging/media/rkisp1/rkisp1-common.h @@ -304,8 +304,7 @@ void rkisp1_sd_adjust_crop_rect(struct v4l2_rect *crop, void rkisp1_sd_adjust_crop(struct v4l2_rect *crop, const struct v4l2_mbus_framefmt *bounds); -int rkisp1_isp_register(struct rkisp1_device *rkisp1, - struct v4l2_device *v4l2_dev); +int rkisp1_isp_register(struct rkisp1_device *rkisp1); void rkisp1_isp_unregister(struct rkisp1_device *rkisp1); const struct rkisp1_isp_mbus_info *rkisp1_isp_mbus_info_get(u32 mbus_code); @@ -322,19 +321,15 @@ void rkisp1_capture_devs_unregister(struct rkisp1_device *rkisp1); int rkisp1_resizer_devs_register(struct rkisp1_device *rkisp1); void rkisp1_resizer_devs_unregister(struct rkisp1_device *rkisp1); -int rkisp1_stats_register(struct rkisp1_stats *stats, - struct v4l2_device *v4l2_dev, - struct rkisp1_device *rkisp1); -void rkisp1_stats_unregister(struct rkisp1_stats *stats); +int rkisp1_stats_register(struct rkisp1_device *rkisp1); +void rkisp1_stats_unregister(struct rkisp1_device *rkisp1); void rkisp1_params_configure(struct rkisp1_params *params, enum rkisp1_fmt_raw_pat_type bayer_pat, enum v4l2_quantization quantization); void rkisp1_params_disable(struct rkisp1_params *params); -int rkisp1_params_register(struct rkisp1_params *params, - struct v4l2_device *v4l2_dev, - struct rkisp1_device *rkisp1); -void rkisp1_params_unregister(struct rkisp1_params *params); +int rkisp1_params_register(struct rkisp1_device *rkisp1); +void rkisp1_params_unregister(struct rkisp1_device *rkisp1); void rkisp1_params_isr_handler(struct rkisp1_device *rkisp1, u32 isp_mis); diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c index a0eb8f08708b..d85ac10e5494 100644 --- a/drivers/staging/media/rkisp1/rkisp1-dev.c +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c @@ -345,7 +345,7 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1) { int ret; - ret = rkisp1_isp_register(rkisp1, &rkisp1->v4l2_dev); + ret = rkisp1_isp_register(rkisp1); if (ret) return ret; @@ -357,12 +357,11 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1) if (ret) goto err_unreg_resizer_devs; - ret = rkisp1_stats_register(&rkisp1->stats, &rkisp1->v4l2_dev, rkisp1); + ret = rkisp1_stats_register(rkisp1); if (ret) goto err_unreg_capture_devs; - ret = rkisp1_params_register(&rkisp1->params, - &rkisp1->v4l2_dev, rkisp1); + ret = rkisp1_params_register(rkisp1); if (ret) goto err_unreg_stats; @@ -375,9 +374,9 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1) return 0; err_unreg_params: - rkisp1_params_unregister(&rkisp1->params); + rkisp1_params_unregister(rkisp1); err_unreg_stats: - rkisp1_stats_unregister(&rkisp1->stats); + rkisp1_stats_unregister(rkisp1); err_unreg_capture_devs: rkisp1_capture_devs_unregister(rkisp1); err_unreg_resizer_devs: @@ -551,8 +550,8 @@ static int rkisp1_remove(struct platform_device *pdev) v4l2_async_notifier_unregister(&rkisp1->notifier); v4l2_async_notifier_cleanup(&rkisp1->notifier); - rkisp1_params_unregister(&rkisp1->params); - rkisp1_stats_unregister(&rkisp1->stats); + rkisp1_params_unregister(rkisp1); + rkisp1_stats_unregister(rkisp1); rkisp1_capture_devs_unregister(rkisp1); rkisp1_resizer_devs_unregister(rkisp1); rkisp1_isp_unregister(rkisp1); diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c index b2131aea5488..d7e533bb6f1d 100644 --- a/drivers/staging/media/rkisp1/rkisp1-isp.c +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c @@ -986,8 +986,7 @@ static const struct v4l2_subdev_ops rkisp1_isp_ops = { .pad = &rkisp1_isp_pad_ops, }; -int rkisp1_isp_register(struct rkisp1_device *rkisp1, - struct v4l2_device *v4l2_dev) +int rkisp1_isp_register(struct rkisp1_device *rkisp1) { struct rkisp1_isp *isp = &rkisp1->isp; struct media_pad *pads = isp->pads; @@ -1016,7 +1015,7 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1, if (ret) return ret; - ret = v4l2_device_register_subdev(v4l2_dev, sd); + ret = v4l2_device_register_subdev(&rkisp1->v4l2_dev, sd); if (ret) { dev_err(rkisp1->dev, "Failed to register isp subdev\n"); goto err_cleanup_media_entity; diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c index 2ab25062cde6..c3c0ab5a5713 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -1570,10 +1570,9 @@ static void rkisp1_init_params(struct rkisp1_params *params) sizeof(struct rkisp1_params_cfg); } -int rkisp1_params_register(struct rkisp1_params *params, - struct v4l2_device *v4l2_dev, - struct rkisp1_device *rkisp1) +int rkisp1_params_register(struct rkisp1_device *rkisp1) { + struct rkisp1_params *params = &rkisp1->params; struct rkisp1_vdev_node *node = ¶ms->vnode; struct video_device *vdev = &node->vdev; int ret; @@ -1593,7 +1592,7 @@ int rkisp1_params_register(struct rkisp1_params *params, * to protect all fops and v4l2 ioctls. */ vdev->lock = &node->vlock; - vdev->v4l2_dev = v4l2_dev; + vdev->v4l2_dev = &rkisp1->v4l2_dev; vdev->queue = &node->buf_queue; vdev->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_META_OUTPUT; vdev->vfl_dir = VFL_DIR_TX; @@ -1619,8 +1618,9 @@ int rkisp1_params_register(struct rkisp1_params *params, return ret; } -void rkisp1_params_unregister(struct rkisp1_params *params) +void rkisp1_params_unregister(struct rkisp1_device *rkisp1) { + struct rkisp1_params *params = &rkisp1->params; struct rkisp1_vdev_node *node = ¶ms->vnode; struct video_device *vdev = &node->vdev; diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c index a67c233b8641..f5dbd134ee24 100644 --- a/drivers/staging/media/rkisp1/rkisp1-stats.c +++ b/drivers/staging/media/rkisp1/rkisp1-stats.c @@ -375,10 +375,9 @@ static void rkisp1_init_stats(struct rkisp1_stats *stats) sizeof(struct rkisp1_stat_buffer); } -int rkisp1_stats_register(struct rkisp1_stats *stats, - struct v4l2_device *v4l2_dev, - struct rkisp1_device *rkisp1) +int rkisp1_stats_register(struct rkisp1_device *rkisp1) { + struct rkisp1_stats *stats = &rkisp1->stats; struct rkisp1_vdev_node *node = &stats->vnode; struct video_device *vdev = &node->vdev; int ret; @@ -395,7 +394,7 @@ int rkisp1_stats_register(struct rkisp1_stats *stats, vdev->fops = &rkisp1_stats_fops; vdev->release = video_device_release_empty; vdev->lock = &node->vlock; - vdev->v4l2_dev = v4l2_dev; + vdev->v4l2_dev = &rkisp1->v4l2_dev; vdev->queue = &node->buf_queue; vdev->device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING; vdev->vfl_dir = VFL_DIR_RX; @@ -425,8 +424,9 @@ int rkisp1_stats_register(struct rkisp1_stats *stats, return ret; } -void rkisp1_stats_unregister(struct rkisp1_stats *stats) +void rkisp1_stats_unregister(struct rkisp1_device *rkisp1) { + struct rkisp1_stats *stats = &rkisp1->stats; struct rkisp1_vdev_node *node = &stats->vnode; struct video_device *vdev = &node->vdev;