aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/cx25840
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-11 04:44:40 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 09:19:03 -0500
commitab22e77cd3d3073c8cac51b59713ef635678dfbe (patch)
treedfe14b163cd094531b260cab7e7d69d035b751da /drivers/media/i2c/cx25840
parentb83e250833e6c40a9e92935ea6fc125b64792357 (diff)
[media] media framework: rename pads init function to media_entity_pads_init()
With the MC next gen rework, what's left for media_entity_init() is to just initialize the PADs. However, certain devices, like a FLASH led/light doesn't have any input or output PAD. So, there's no reason why calling media_entity_init() would be mandatory. Also, despite its name, what this function actually does is to initialize the PADs data. So, rename it to media_entity_pads_init() in order to reflect that. The media entity actual init happens during entity register, at media_device_register_entity(). We should move init of num_links and num_backlinks to it. 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 4d975aa5be36..07a3e7173144 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -5213,7 +5213,7 @@ static int cx25840_probe(struct i2c_client *client,
5213 state->pads[CX25840_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE; 5213 state->pads[CX25840_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
5214 sd->entity.function = MEDIA_ENT_F_ATV_DECODER; 5214 sd->entity.function = MEDIA_ENT_F_ATV_DECODER;
5215 5215
5216 ret = media_entity_init(&sd->entity, ARRAY_SIZE(state->pads), 5216 ret = media_entity_pads_init(&sd->entity, ARRAY_SIZE(state->pads),
5217 state->pads); 5217 state->pads);
5218 if (ret < 0) { 5218 if (ret < 0) {
5219 v4l_info(client, "failed to initialize media entity!\n"); 5219 v4l_info(client, "failed to initialize media entity!\n");