diff options
| author | Steve Longerbeam <slongerbeam@gmail.com> | 2019-05-10 17:50:07 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-05-28 14:10:25 -0400 |
| commit | 3e80d125b5075ed66a208cdcb1581e8d414ffd63 (patch) | |
| tree | b62e72a508fbd12ef5432c791886dff45f4937ac /drivers/staging/media/imx/imx-ic-prpencvf.c | |
| parent | 34ff38745b166f317530c05ac881aafc20c33041 (diff) | |
| download | linux-3e80d125b5075ed66a208cdcb1581e8d414ffd63.tar.bz2 | |
media: staging/imx: Move add_video_device into capture_device_register
Move imx_media_add_video_device() into imx_media_capture_device_register().
Also the former has no error conditions to convert to void.
Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging/media/imx/imx-ic-prpencvf.c')
| -rw-r--r-- | drivers/staging/media/imx/imx-ic-prpencvf.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c index 25d926a48d1f..f01a9c4fffac 100644 --- a/drivers/staging/media/imx/imx-ic-prpencvf.c +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c @@ -1237,7 +1237,6 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd, static int prp_registered(struct v4l2_subdev *sd) { struct prp_priv *priv = sd_to_priv(sd); - struct imx_ic_priv *ic_priv = priv->ic_priv; int i, ret; u32 code; @@ -1267,10 +1266,6 @@ static int prp_registered(struct v4l2_subdev *sd) if (ret) return ret; - ret = imx_media_add_video_device(ic_priv->md, priv->vdev); - if (ret) - goto unreg; - ret = prp_init_controls(priv); if (ret) goto unreg; |