From: Dafna Hirschfeld Date: Thu, 6 Aug 2020 10:34:14 +0000 (+0200) Subject: media: staging: rkisp1: unify (un)register functions to have the same parameters X-Git-Tag: v5.10.7~1469^2~437 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e76ae8e4db0aa8af47a47c00e1ccaa51eddd9ac;p=platform%2Fkernel%2Flinux-rpi.git media: staging: rkisp1: unify (un)register functions to have the same parameters 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h index e54793d..7d414f8 100644 --- a/drivers/staging/media/rkisp1/rkisp1-common.h +++ b/drivers/staging/media/rkisp1/rkisp1-common.h @@ -303,8 +303,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); @@ -321,19 +320,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 a0eb8f0..d85ac10 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 6ec1e98..7b40f53 100644 --- a/drivers/staging/media/rkisp1/rkisp1-isp.c +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c @@ -989,8 +989,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; @@ -1018,7 +1017,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 416e3a2..1ad5dc32 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -1564,10 +1564,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; @@ -1587,7 +1586,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; @@ -1611,8 +1610,9 @@ err_cleanup_media_entity: 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 967d67a..1daab7a 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; @@ -424,8 +423,9 @@ err_mutex_destroy: 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;