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

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

[media] v4l: vsp1: Move subdev initialization code to vsp1_entity_init() 



Don't duplicate the code in every module driver, centralize it in a
single place.

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

drivers/media/platform/vsp1/vsp1_bru.c

+2 −16
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static struct v4l2_subdev_ops bru_ops = { 


struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1)

{

	struct v4l2_subdev *subdev;

	struct vsp1_bru *bru;

	int ret;
@@ -415,24 +414,11 @@ struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1) 


	bru->entity.type = VSP1_ENTITY_BRU;



	ret = vsp1_entity_init(vsp1, &bru->entity,

			       vsp1->info->num_bru_inputs + 1);

	ret = vsp1_entity_init(vsp1, &bru->entity, "bru",

			       vsp1->info->num_bru_inputs + 1, &bru_ops);

	if (ret < 0)

		return ERR_PTR(ret);



	/* Initialize the V4L2 subdev. */

	subdev = &bru->entity.subdev;

	v4l2_subdev_init(subdev, &bru_ops);



	subdev->entity.ops = &vsp1->media_ops;

	subdev->internal_ops = &vsp1_subdev_internal_ops;

	snprintf(subdev->name, sizeof(subdev->name), "%s bru",

		 dev_name(vsp1->dev));

	v4l2_set_subdevdata(subdev, bru);

	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;



	vsp1_entity_init_formats(subdev, NULL);



	/* Initialize the control handler. */

	v4l2_ctrl_handler_init(&bru->ctrls, 1);

	v4l2_ctrl_new_std(&bru->ctrls, &bru_ctrl_ops, V4L2_CID_BG_COLOR,

drivers/media/platform/vsp1/vsp1_entity.c

+25 −5
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ vsp1_entity_get_pad_format(struct vsp1_entity *entity, 
 * formats are initialized on the file handle. Otherwise active formats are

 * initialized on the device.

 */

void vsp1_entity_init_formats(struct v4l2_subdev *subdev,

static void vsp1_entity_init_formats(struct v4l2_subdev *subdev,

				     struct v4l2_subdev_pad_config *cfg)

{

	struct v4l2_subdev_format format;
@@ -159,9 +159,12 @@ static const struct vsp1_route vsp1_routes[] = { 
};



int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,

		     unsigned int num_pads)

		     const char *name, unsigned int num_pads,

		     const struct v4l2_subdev_ops *ops)

{

	struct v4l2_subdev *subdev;

	unsigned int i;

	int ret;



	for (i = 0; i < ARRAY_SIZE(vsp1_routes); ++i) {

		if (vsp1_routes[i].type == entity->type &&
@@ -196,8 +199,25 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity, 
	entity->pads[num_pads - 1].flags = MEDIA_PAD_FL_SOURCE;



	/* Initialize the media entity. */

	return media_entity_pads_init(&entity->subdev.entity, num_pads,

	ret = media_entity_pads_init(&entity->subdev.entity, num_pads,

				     entity->pads);

	if (ret < 0)

		return ret;



	/* Initialize the V4L2 subdev. */

	subdev = &entity->subdev;

	v4l2_subdev_init(subdev, ops);



	subdev->entity.ops = &vsp1->media_ops;

	subdev->internal_ops = &vsp1_subdev_internal_ops;

	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;



	snprintf(subdev->name, sizeof(subdev->name), "%s %s",

		 dev_name(vsp1->dev), name);



	vsp1_entity_init_formats(subdev, NULL);



	return 0;

}



void vsp1_entity_destroy(struct vsp1_entity *entity)

drivers/media/platform/vsp1/vsp1_entity.h

+2 −3
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ static inline struct vsp1_entity *to_vsp1_entity(struct v4l2_subdev *subdev) 
}



int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,

		     unsigned int num_pads);

		     const char *name, unsigned int num_pads,

		     const struct v4l2_subdev_ops *ops);

void vsp1_entity_destroy(struct vsp1_entity *entity);



extern const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops;
@@ -94,8 +95,6 @@ struct v4l2_mbus_framefmt * 
vsp1_entity_get_pad_format(struct vsp1_entity *entity,

			   struct v4l2_subdev_pad_config *cfg,

			   unsigned int pad, u32 which);

void vsp1_entity_init_formats(struct v4l2_subdev *subdev,

			      struct v4l2_subdev_pad_config *cfg);



void vsp1_entity_route_setup(struct vsp1_entity *source);

drivers/media/platform/vsp1/vsp1_hsit.c

+2 −15
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ static struct v4l2_subdev_ops hsit_ops = { 


struct vsp1_hsit *vsp1_hsit_create(struct vsp1_device *vsp1, bool inverse)

{

	struct v4l2_subdev *subdev;

	struct vsp1_hsit *hsit;

	int ret;
@@ -195,22 +194,10 @@ struct vsp1_hsit *vsp1_hsit_create(struct vsp1_device *vsp1, bool inverse) 
	else

		hsit->entity.type = VSP1_ENTITY_HST;



	ret = vsp1_entity_init(vsp1, &hsit->entity, 2);

	ret = vsp1_entity_init(vsp1, &hsit->entity, inverse ? "hsi" : "hst", 2,

			       &hsit_ops);

	if (ret < 0)

		return ERR_PTR(ret);



	/* Initialize the V4L2 subdev. */

	subdev = &hsit->entity.subdev;

	v4l2_subdev_init(subdev, &hsit_ops);



	subdev->entity.ops = &vsp1->media_ops;

	subdev->internal_ops = &vsp1_subdev_internal_ops;

	snprintf(subdev->name, sizeof(subdev->name), "%s %s",

		 dev_name(vsp1->dev), inverse ? "hsi" : "hst");

	v4l2_set_subdevdata(subdev, hsit);

	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;



	vsp1_entity_init_formats(subdev, NULL);



	return hsit;

}

drivers/media/platform/vsp1/vsp1_lif.c

+1 −15
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static struct v4l2_subdev_ops lif_ops = { 


struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1)

{

	struct v4l2_subdev *subdev;

	struct vsp1_lif *lif;

	int ret;
@@ -217,22 +216,9 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1) 


	lif->entity.type = VSP1_ENTITY_LIF;



	ret = vsp1_entity_init(vsp1, &lif->entity, 2);

	ret = vsp1_entity_init(vsp1, &lif->entity, "lif", 2, &lif_ops);

	if (ret < 0)

		return ERR_PTR(ret);



	/* Initialize the V4L2 subdev. */

	subdev = &lif->entity.subdev;

	v4l2_subdev_init(subdev, &lif_ops);



	subdev->entity.ops = &vsp1->media_ops;

	subdev->internal_ops = &vsp1_subdev_internal_ops;

	snprintf(subdev->name, sizeof(subdev->name), "%s lif",

		 dev_name(vsp1->dev));

	v4l2_set_subdevdata(subdev, lif);

	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;



	vsp1_entity_init_formats(subdev, NULL);



	return lif;

}