summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/omap4iss/iss_resizer.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2015-12-11 10:44:40 +0100
committerMauro Carvalho Chehab2016-01-11 15:19:03 +0100
commitab22e77cd3d3073c8cac51b59713ef635678dfbe (patch)
treedfe14b163cd094531b260cab7e7d69d035b751da /drivers/staging/media/omap4iss/iss_resizer.c
parent[media] media-device: better name Kernelspace/Userspace links (diff)
downloadkernel-qcow2-linux-ab22e77cd3d3073c8cac51b59713ef635678dfbe.tar.gz
kernel-qcow2-linux-ab22e77cd3d3073c8cac51b59713ef635678dfbe.tar.xz
kernel-qcow2-linux-ab22e77cd3d3073c8cac51b59713ef635678dfbe.zip
[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/staging/media/omap4iss/iss_resizer.c')
-rw-r--r--drivers/staging/media/omap4iss/iss_resizer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c
index a3925ecd0ed7..fea13ab4041f 100644
--- a/drivers/staging/media/omap4iss/iss_resizer.c
+++ b/drivers/staging/media/omap4iss/iss_resizer.c
@@ -790,7 +790,7 @@ static int resizer_init_entities(struct iss_resizer_device *resizer)
pads[RESIZER_PAD_SOURCE_MEM].flags = MEDIA_PAD_FL_SOURCE;
me->ops = &resizer_media_ops;
- ret = media_entity_init(me, RESIZER_PADS_NUM, pads);
+ ret = media_entity_pads_init(me, RESIZER_PADS_NUM, pads);
if (ret < 0)
return ret;