aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core/v4l2-subdev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-09-06 08:33:39 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 09:19:00 -0500
commit0e576b76f5470a2f8b2287958a2b9a3dd0f56f10 (patch)
tree8c35b42290ca39072a406e44e20970174b7dfe80 /drivers/media/v4l2-core/v4l2-subdev.c
parent77328043d9e6feb12e53a4fc5485cf664d2878e4 (diff)
[media] media-entity.h: rename entity.type to entity.function
Entities should have one or more functions. Calling it as a type proofed to not be correct, as an entity could eventually have more than one type. So, rename the field as function. Please notice that this patch doesn't extend support for multiple function entities. Such change will happen when we have real case drivers using it. No functional changes. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-subdev.c')
-rw-r--r--drivers/media/v4l2-core/v4l2-subdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index b3bcc8253182..b440cb66669c 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -535,9 +535,9 @@ v4l2_subdev_link_validate_get_format(struct media_pad *pad,
535 return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt); 535 return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt);
536 } 536 }
537 537
538 WARN(pad->entity->type != MEDIA_ENT_T_V4L2_VIDEO, 538 WARN(pad->entity->function != MEDIA_ENT_T_V4L2_VIDEO,
539 "Driver bug! Wrong media entity type 0x%08x, entity %s\n", 539 "Driver bug! Wrong media entity type 0x%08x, entity %s\n",
540 pad->entity->type, pad->entity->name); 540 pad->entity->function, pad->entity->name);
541 541
542 return -EINVAL; 542 return -EINVAL;
543} 543}
@@ -584,7 +584,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
584 sd->host_priv = NULL; 584 sd->host_priv = NULL;
585#if defined(CONFIG_MEDIA_CONTROLLER) 585#if defined(CONFIG_MEDIA_CONTROLLER)
586 sd->entity.name = sd->name; 586 sd->entity.name = sd->name;
587 sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN; 587 sd->entity.function = MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN;
588#endif 588#endif
589} 589}
590EXPORT_SYMBOL(v4l2_subdev_init); 590EXPORT_SYMBOL(v4l2_subdev_init);