2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00

media: vimc: cleanup code that assigns entity in entities array

Since the add callback returns NULL on failure and the array
is initialized to NULLs, there is no need for the intermediate
assignment to local var.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2019-10-07 10:50:00 -03:00 committed by Mauro Carvalho Chehab
parent 817d0b3278
commit 4996992c4f

View File

@ -160,19 +160,17 @@ err_rm_links:
static int vimc_add_subdevs(struct vimc_device *vimc)
{
unsigned int i;
struct vimc_ent_device *ved;
for (i = 0; i < vimc->pipe_cfg->num_ents; i++) {
dev_dbg(&vimc->pdev.dev, "new entity for %s\n",
vimc->pipe_cfg->ents[i].name);
ved = vimc->pipe_cfg->ents[i].add(vimc,
vimc->ent_devs[i] = vimc->pipe_cfg->ents[i].add(vimc,
vimc->pipe_cfg->ents[i].name);
if (!ved) {
if (!vimc->ent_devs[i]) {
dev_err(&vimc->pdev.dev, "add new entity for %s\n",
vimc->pipe_cfg->ents[i].name);
return -EINVAL;
}
vimc->ent_devs[i] = ved;
}
return 0;
}