Commit 8b4a0563 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Change the type of the rwpf field in struct vsp1_video 



The rwpf field contains a pointer to the rpf or wpf associated with the
video node. Instead of storing it as a vsp1_entity, store the
corresponding vsp1_rwpf pointer to allow accessing the vsp1_rwpf fields
directly.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1ad3dfed

drivers/media/platform/vsp1/vsp1_rpf.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/vsp1/vsp1_video.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/vsp1/vsp1_video.h

+3 −2
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/vsp1/vsp1_wpf.c

+1 −1
Original line number Diff line number Diff line
@@ -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;