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

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

[media] v4l: vsp1: Factorize get pad format code 



All entities implement the same get pad format handler, factorize it
into a common function.

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

drivers/media/platform/vsp1/vsp1_bru.c

+1 −18
Original line number Diff line number Diff line
@@ -129,23 +129,6 @@ static struct v4l2_rect *bru_get_compose(struct vsp1_bru *bru, 
	return v4l2_subdev_get_try_compose(&bru->entity.subdev, cfg, pad);

}



static int bru_get_format(struct v4l2_subdev *subdev,

			  struct v4l2_subdev_pad_config *cfg,

			  struct v4l2_subdev_format *fmt)

{

	struct vsp1_bru *bru = to_bru(subdev);

	struct v4l2_subdev_pad_config *config;



	config = vsp1_entity_get_pad_config(&bru->entity, cfg, fmt->which);

	if (!config)

		return -EINVAL;



	fmt->format = *vsp1_entity_get_pad_format(&bru->entity, config,

						  fmt->pad);



	return 0;

}



static void bru_try_format(struct vsp1_bru *bru,

			   struct v4l2_subdev_pad_config *config,

			   unsigned int pad, struct v4l2_mbus_framefmt *fmt)
@@ -292,7 +275,7 @@ static struct v4l2_subdev_pad_ops bru_pad_ops = { 
	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = bru_enum_mbus_code,

	.enum_frame_size = bru_enum_frame_size,

	.get_fmt = bru_get_format,

	.get_fmt = vsp1_subdev_get_pad_format,

	.set_fmt = bru_set_format,

	.get_selection = bru_get_selection,

	.set_selection = bru_set_selection,

drivers/media/platform/vsp1/vsp1_entity.c

+25 −0
Original line number Diff line number Diff line
@@ -116,6 +116,31 @@ int vsp1_entity_init_cfg(struct v4l2_subdev *subdev, 
	return 0;

}



/*

 * vsp1_subdev_get_pad_format - Subdev pad get_fmt handler

 * @subdev: V4L2 subdevice

 * @cfg: V4L2 subdev pad configuration

 * @fmt: V4L2 subdev format

 *

 * This function implements the subdev get_fmt pad operation. It can be used as

 * a direct drop-in for the operation handler.

 */

int vsp1_subdev_get_pad_format(struct v4l2_subdev *subdev,

			       struct v4l2_subdev_pad_config *cfg,

			       struct v4l2_subdev_format *fmt)

{

	struct vsp1_entity *entity = to_vsp1_entity(subdev);

	struct v4l2_subdev_pad_config *config;



	config = vsp1_entity_get_pad_config(entity, cfg, fmt->which);

	if (!config)

		return -EINVAL;



	fmt->format = *vsp1_entity_get_pad_format(entity, config, fmt->pad);



	return 0;

}



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

 * Media Operations

 */

drivers/media/platform/vsp1/vsp1_entity.h

+4 −0
Original line number Diff line number Diff line
@@ -127,4 +127,8 @@ int vsp1_entity_init_cfg(struct v4l2_subdev *subdev, 
void vsp1_entity_route_setup(struct vsp1_entity *source,

			     struct vsp1_dl_list *dl);



int vsp1_subdev_get_pad_format(struct v4l2_subdev *subdev,

			       struct v4l2_subdev_pad_config *cfg,

			       struct v4l2_subdev_format *fmt);



#endif /* __VSP1_ENTITY_H__ */

drivers/media/platform/vsp1/vsp1_hsit.c

+1 −18
Original line number Diff line number Diff line
@@ -90,23 +90,6 @@ static int hsit_enum_frame_size(struct v4l2_subdev *subdev, 
	return 0;

}



static int hsit_get_format(struct v4l2_subdev *subdev,

			   struct v4l2_subdev_pad_config *cfg,

			   struct v4l2_subdev_format *fmt)

{

	struct vsp1_hsit *hsit = to_hsit(subdev);

	struct v4l2_subdev_pad_config *config;



	config = vsp1_entity_get_pad_config(&hsit->entity, cfg, fmt->which);

	if (!config)

		return -EINVAL;



	fmt->format = *vsp1_entity_get_pad_format(&hsit->entity, config,

						  fmt->pad);



	return 0;

}



static int hsit_set_format(struct v4l2_subdev *subdev,

			   struct v4l2_subdev_pad_config *cfg,

			   struct v4l2_subdev_format *fmt)
@@ -154,7 +137,7 @@ static struct v4l2_subdev_pad_ops hsit_pad_ops = { 
	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = hsit_enum_mbus_code,

	.enum_frame_size = hsit_enum_frame_size,

	.get_fmt = hsit_get_format,

	.get_fmt = vsp1_subdev_get_pad_format,

	.set_fmt = hsit_set_format,

};

drivers/media/platform/vsp1/vsp1_lif.c

+1 −18
Original line number Diff line number Diff line
@@ -107,23 +107,6 @@ static int lif_enum_frame_size(struct v4l2_subdev *subdev, 
	return 0;

}



static int lif_get_format(struct v4l2_subdev *subdev,

			  struct v4l2_subdev_pad_config *cfg,

			  struct v4l2_subdev_format *fmt)

{

	struct vsp1_lif *lif = to_lif(subdev);

	struct v4l2_subdev_pad_config *config;



	config = vsp1_entity_get_pad_config(&lif->entity, cfg, fmt->which);

	if (!config)

		return -EINVAL;



	fmt->format = *vsp1_entity_get_pad_format(&lif->entity, config,

						  fmt->pad);



	return 0;

}



static int lif_set_format(struct v4l2_subdev *subdev,

			  struct v4l2_subdev_pad_config *cfg,

			  struct v4l2_subdev_format *fmt)
@@ -173,7 +156,7 @@ static struct v4l2_subdev_pad_ops lif_pad_ops = { 
	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = lif_enum_mbus_code,

	.enum_frame_size = lif_enum_frame_size,

	.get_fmt = lif_get_format,

	.get_fmt = vsp1_subdev_get_pad_format,

	.set_fmt = lif_set_format,

};