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>

diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
index 65048bd7d80bbb31f0e22dd8d457c502f8ec9816..97a272f3350a8a4ffb737664134f39b04767043c 100644 (file)
--- a/drivers/media/platform/vimc/vimc-core.c
+++ b/drivers/media/platform/vimc/vimc-core.c
@@ -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;
 }