summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/cx25840
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2015-09-06 14:33:39 +0200
committerMauro Carvalho Chehab2016-01-11 15:19:00 +0100
commit0e576b76f5470a2f8b2287958a2b9a3dd0f56f10 (patch)
tree8c35b42290ca39072a406e44e20970174b7dfe80 /drivers/media/i2c/cx25840
parent[media] media-entity: must check media_create_pad_link() (diff)
downloadkernel-qcow2-linux-0e576b76f5470a2f8b2287958a2b9a3dd0f56f10.tar.gz
kernel-qcow2-linux-0e576b76f5470a2f8b2287958a2b9a3dd0f56f10.tar.xz
kernel-qcow2-linux-0e576b76f5470a2f8b2287958a2b9a3dd0f56f10.zip
[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/i2c/cx25840')
-rw-r--r--drivers/media/i2c/cx25840/cx25840-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index 022ad5ae8869..73bd05ee2fee 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -5211,7 +5211,7 @@ static int cx25840_probe(struct i2c_client *client,
state->pads[CX25840_PAD_INPUT].flags = MEDIA_PAD_FL_SINK;
state->pads[CX25840_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
state->pads[CX25840_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
- sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_DECODER;
+ sd->entity.function = MEDIA_ENT_T_V4L2_SUBDEV_DECODER;
ret = media_entity_init(&sd->entity, ARRAY_SIZE(state->pads),
state->pads);