diff options
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_rpf.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_video.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_video.h | 5 | ||||
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_wpf.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c index b988e46818a5..c7a4121bcd53 100644 --- a/drivers/media/platform/vsp1/vsp1_rpf.c +++ b/drivers/media/platform/vsp1/vsp1_rpf.c @@ -271,7 +271,7 @@ struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index) video->vsp1 = vsp1; video->ops = &rpf_vdev_ops; - ret = vsp1_video_init(video, &rpf->entity); + ret = vsp1_video_init(video, rpf); if (ret < 0) goto error; diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index ac07dd8e4a81..b5ebca5d2410 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -1203,7 +1203,7 @@ static struct v4l2_file_operations vsp1_video_fops = { * Initialization and Cleanup */ -int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf) +int vsp1_video_init(struct vsp1_video *video, struct vsp1_rwpf *rwpf) { const char *direction; int ret; @@ -1258,7 +1258,7 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf) video->video.v4l2_dev = &video->vsp1->v4l2_dev; video->video.fops = &vsp1_video_fops; snprintf(video->video.name, sizeof(video->video.name), "%s %s", - rwpf->subdev.name, direction); + rwpf->entity.subdev.name, direction); video->video.vfl_type = VFL_TYPE_GRABBER; video->video.release = video_device_release_empty; video->video.ioctl_ops = &vsp1_video_ioctl_ops; diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platform/vsp1/vsp1_video.h index a929aa81cdbf..c1d9771c55ed 100644 --- a/drivers/media/platform/vsp1/vsp1_video.h +++ b/drivers/media/platform/vsp1/vsp1_video.h @@ -20,6 +20,7 @@ #include <media/media-entity.h> #include <media/videobuf2-v4l2.h> +struct vsp1_rwpf; struct vsp1_video; /* @@ -113,7 +114,7 @@ struct vsp1_video_operations { struct vsp1_video { struct vsp1_device *vsp1; - struct vsp1_entity *rwpf; + struct vsp1_rwpf *rwpf; const struct vsp1_video_operations *ops; @@ -140,7 +141,7 @@ static inline struct vsp1_video *to_vsp1_video(struct video_device *vdev) return container_of(vdev, struct vsp1_video, video); } -int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf); +int vsp1_video_init(struct vsp1_video *video, struct vsp1_rwpf *rwpf); void vsp1_video_cleanup(struct vsp1_video *video); void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe); diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c index 1d722f7e2407..01493fd207bf 100644 --- a/drivers/media/platform/vsp1/vsp1_wpf.c +++ b/drivers/media/platform/vsp1/vsp1_wpf.c @@ -270,7 +270,7 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index) video->vsp1 = vsp1; video->ops = &wpf_vdev_ops; - ret = vsp1_video_init(video, &wpf->entity); + ret = vsp1_video_init(video, wpf); if (ret < 0) goto error; |