]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] DaVinci-VPBE: Return an error code only as a constant in vpbe_probe()
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 11 Oct 2016 11:43:25 +0000 (08:43 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 16 Nov 2016 14:20:43 +0000 (12:20 -0200)
* Return an error code without storing it in an intermediate variable.

* Delete the local variable "ret" which became unnecessary with
  this refactoring.

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 c8c69442c793ef7b627291ceecaad4b1fa8ea15d..3ac4ba35832a899d9fd36b32798dd29e1579d091 100644 (file)
@@ -818,7 +818,6 @@ static int vpbe_probe(struct platform_device *pdev)
 {
        struct vpbe_device *vpbe_dev;
        struct vpbe_config *cfg;
-       int ret = -EINVAL;
 
        if (!pdev->dev.platform_data) {
                v4l2_err(pdev->dev.driver, "No platform data\n");
@@ -830,7 +829,7 @@ static int vpbe_probe(struct platform_device *pdev)
            !cfg->osd.module_name[0] ||
            !cfg->venc.module_name[0]) {
                v4l2_err(pdev->dev.driver, "vpbe display module names not defined\n");
-               return ret;
+               return -EINVAL;
        }
 
        vpbe_dev = kzalloc(sizeof(*vpbe_dev), GFP_KERNEL);