]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] DaVinci-VPBE: Reduce the scope for a variable in vpbe_set_default_output()
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 12 Oct 2016 07:54:26 +0000 (04:54 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 16 Nov 2016 14:40:32 +0000 (12:40 -0200)
* Move the definition for the variable "ret" into an if branch
  so that an extra initialisation can be avoided at the beginning
  by this refactoring.

* Return a success code as a constant at the end.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/davinci/vpbe.c

index 50b9e3df68b534040517ce45b5e1a9c59e469aac..77b3365b71efe4d39ffed370dfc494023699291f 100644 (file)
@@ -297,19 +297,19 @@ out:
 static int vpbe_set_default_output(struct vpbe_device *vpbe_dev)
 {
        struct vpbe_config *cfg = vpbe_dev->cfg;
-       int ret = 0;
        int i;
 
        for (i = 0; i < cfg->num_outputs; i++) {
                if (!strcmp(def_output,
                            cfg->outputs[i].output.name)) {
-                       ret = vpbe_set_output(vpbe_dev, i);
+                       int ret = vpbe_set_output(vpbe_dev, i);
+
                        if (!ret)
                                vpbe_dev->current_out_index = i;
                        return ret;
                }
        }
-       return ret;
+       return 0;
 }
 
 /**