Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] v4l: vsp1: Merge RPF and WPF pad ops structures 



The two structures are identical, merge them and move the result to
vsp1_rwpf.c. All rwpf pad operations can now be declared static.

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

drivers/media/platform/vsp1/vsp1_rpf.c

+1 −11
Original line number Diff line number Diff line
@@ -36,18 +36,8 @@ static inline void vsp1_rpf_write(struct vsp1_rwpf *rpf, u32 reg, u32 data) 
 * V4L2 Subdevice Operations

 */



static struct v4l2_subdev_pad_ops rpf_pad_ops = {

	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = vsp1_rwpf_enum_mbus_code,

	.enum_frame_size = vsp1_rwpf_enum_frame_size,

	.get_fmt = vsp1_rwpf_get_format,

	.set_fmt = vsp1_rwpf_set_format,

	.get_selection = vsp1_rwpf_get_selection,

	.set_selection = vsp1_rwpf_set_selection,

};



static struct v4l2_subdev_ops rpf_ops = {

	.pad    = &rpf_pad_ops,

	.pad    = &vsp1_rwpf_pad_ops,

};



/* -----------------------------------------------------------------------------

drivers/media/platform/vsp1/vsp1_rwpf.c

+35 −25
Original line number Diff line number Diff line
@@ -20,11 +20,18 @@ 
#define RWPF_MIN_WIDTH				1

#define RWPF_MIN_HEIGHT				1



struct v4l2_rect *vsp1_rwpf_get_crop(struct vsp1_rwpf *rwpf,

				     struct v4l2_subdev_pad_config *config)

{

	return v4l2_subdev_get_try_crop(&rwpf->entity.subdev, config,

					RWPF_PAD_SINK);

}



/* -----------------------------------------------------------------------------

 * V4L2 Subdevice Pad Operations

 */



int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev,

static int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev,

				    struct v4l2_subdev_pad_config *cfg,

				    struct v4l2_subdev_mbus_code_enum *code)

{
@@ -41,7 +48,7 @@ int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev, 
	return 0;

}



int vsp1_rwpf_enum_frame_size(struct v4l2_subdev *subdev,

static int vsp1_rwpf_enum_frame_size(struct v4l2_subdev *subdev,

				     struct v4l2_subdev_pad_config *cfg,

				     struct v4l2_subdev_frame_size_enum *fse)

{
@@ -76,14 +83,7 @@ int vsp1_rwpf_enum_frame_size(struct v4l2_subdev *subdev, 
	return 0;

}



struct v4l2_rect *vsp1_rwpf_get_crop(struct vsp1_rwpf *rwpf,

				     struct v4l2_subdev_pad_config *config)

{

	return v4l2_subdev_get_try_crop(&rwpf->entity.subdev, config,

					RWPF_PAD_SINK);

}



int vsp1_rwpf_get_format(struct v4l2_subdev *subdev,

static int vsp1_rwpf_get_format(struct v4l2_subdev *subdev,

				struct v4l2_subdev_pad_config *cfg,

				struct v4l2_subdev_format *fmt)

{
@@ -100,7 +100,7 @@ int vsp1_rwpf_get_format(struct v4l2_subdev *subdev, 
	return 0;

}



int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,

static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,

				struct v4l2_subdev_pad_config *cfg,

				struct v4l2_subdev_format *fmt)

{
@@ -154,7 +154,7 @@ int vsp1_rwpf_set_format(struct v4l2_subdev *subdev, 
	return 0;

}



int vsp1_rwpf_get_selection(struct v4l2_subdev *subdev,

static int vsp1_rwpf_get_selection(struct v4l2_subdev *subdev,

				   struct v4l2_subdev_pad_config *cfg,

				   struct v4l2_subdev_selection *sel)

{
@@ -191,7 +191,7 @@ int vsp1_rwpf_get_selection(struct v4l2_subdev *subdev, 
	return 0;

}



int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,

static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,

				   struct v4l2_subdev_pad_config *cfg,

				   struct v4l2_subdev_selection *sel)

{
@@ -250,6 +250,16 @@ int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev, 
	return 0;

}



const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops = {

	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = vsp1_rwpf_enum_mbus_code,

	.enum_frame_size = vsp1_rwpf_enum_frame_size,

	.get_fmt = vsp1_rwpf_get_format,

	.set_fmt = vsp1_rwpf_set_format,

	.get_selection = vsp1_rwpf_get_selection,

	.set_selection = vsp1_rwpf_set_selection,

};



/* -----------------------------------------------------------------------------

 * Controls

 */

drivers/media/platform/vsp1/vsp1_rwpf.h

+1 −18
Original line number Diff line number Diff line
@@ -68,24 +68,7 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index); 


int vsp1_rwpf_init_ctrls(struct vsp1_rwpf *rwpf);



int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev,

			     struct v4l2_subdev_pad_config *cfg,

			     struct v4l2_subdev_mbus_code_enum *code);

int vsp1_rwpf_enum_frame_size(struct v4l2_subdev *subdev,

			      struct v4l2_subdev_pad_config *cfg,

			      struct v4l2_subdev_frame_size_enum *fse);

int vsp1_rwpf_get_format(struct v4l2_subdev *subdev,

			 struct v4l2_subdev_pad_config *cfg,

			 struct v4l2_subdev_format *fmt);

int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,

			 struct v4l2_subdev_pad_config *cfg,

			 struct v4l2_subdev_format *fmt);

int vsp1_rwpf_get_selection(struct v4l2_subdev *subdev,

			    struct v4l2_subdev_pad_config *cfg,

			    struct v4l2_subdev_selection *sel);

int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,

			    struct v4l2_subdev_pad_config *cfg,

			    struct v4l2_subdev_selection *sel);

extern const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops;



struct v4l2_rect *vsp1_rwpf_get_crop(struct vsp1_rwpf *rwpf,

				     struct v4l2_subdev_pad_config *config);

drivers/media/platform/vsp1/vsp1_wpf.c

+1 −11
Original line number Diff line number Diff line
@@ -63,19 +63,9 @@ static struct v4l2_subdev_video_ops wpf_video_ops = { 
	.s_stream = wpf_s_stream,

};



static struct v4l2_subdev_pad_ops wpf_pad_ops = {

	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = vsp1_rwpf_enum_mbus_code,

	.enum_frame_size = vsp1_rwpf_enum_frame_size,

	.get_fmt = vsp1_rwpf_get_format,

	.set_fmt = vsp1_rwpf_set_format,

	.get_selection = vsp1_rwpf_get_selection,

	.set_selection = vsp1_rwpf_set_selection,

};



static struct v4l2_subdev_ops wpf_ops = {

	.video	= &wpf_video_ops,

	.pad    = &wpf_pad_ops,

	.pad    = &vsp1_rwpf_pad_ops,

};



/* -----------------------------------------------------------------------------