diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-11 07:44:40 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 12:19:03 -0200 |
| commit | ab22e77cd3d3073c8cac51b59713ef635678dfbe (patch) | |
| tree | dfe14b163cd094531b260cab7e7d69d035b751da /drivers/media/i2c/s5c73m3/s5c73m3-core.c | |
| parent | b83e250833e6c40a9e92935ea6fc125b64792357 (diff) | |
| download | linux-stable-ab22e77cd3d3073c8cac51b59713ef635678dfbe.tar.gz linux-stable-ab22e77cd3d3073c8cac51b59713ef635678dfbe.tar.bz2 linux-stable-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/media/i2c/s5c73m3/s5c73m3-core.c')
| -rw-r--r-- | drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index 3d578f2ce7b2..57b3d27993a4 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c @@ -1690,7 +1690,7 @@ static int s5c73m3_probe(struct i2c_client *client, state->sensor_pads[S5C73M3_ISP_PAD].flags = MEDIA_PAD_FL_SOURCE; sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; - ret = media_entity_init(&sd->entity, S5C73M3_NUM_PADS, + ret = media_entity_pads_init(&sd->entity, S5C73M3_NUM_PADS, state->sensor_pads); if (ret < 0) return ret; @@ -1706,7 +1706,7 @@ static int s5c73m3_probe(struct i2c_client *client, state->oif_pads[OIF_SOURCE_PAD].flags = MEDIA_PAD_FL_SOURCE; oif_sd->entity.function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; - ret = media_entity_init(&oif_sd->entity, OIF_NUM_PADS, + ret = media_entity_pads_init(&oif_sd->entity, OIF_NUM_PADS, state->oif_pads); if (ret < 0) return ret; |