]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] DaVinci-VPBE: Delete two error messages for a failed memory allocation
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 11 Oct 2016 07:56:13 +0000 (04:56 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 16 Nov 2016 14:19:50 +0000 (12:19 -0200)
The script "checkpatch.pl" pointed information out like the following.

WARNING: Possible unnecessary 'out of memory' message

Thus remove such a logging statement in two functions.

Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
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 785d6cf9315271ed9e44988ce53f5a4406ff8a50..79c2ebe3862a6702a80f2365c802a1bc187d8f5d 100644 (file)
@@ -680,8 +680,6 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
                                           sizeof(*vpbe_dev->encoders),
                                           GFP_KERNEL);
        if (NULL == vpbe_dev->encoders) {
-               v4l2_err(&vpbe_dev->v4l2_dev,
-                       "unable to allocate memory for encoders sub devices");
                ret = -ENOMEM;
                goto fail_dev_unregister;
        }
@@ -837,10 +835,9 @@ static int vpbe_probe(struct platform_device *pdev)
        }
 
        vpbe_dev = kzalloc(sizeof(*vpbe_dev), GFP_KERNEL);
-       if (vpbe_dev == NULL) {
-               v4l2_err(pdev->dev.driver, "Unable to allocate memory for vpbe_device\n");
+       if (!vpbe_dev)
                return -ENOMEM;
-       }
+
        vpbe_dev->cfg = cfg;
        vpbe_dev->ops = vpbe_dev_ops;
        vpbe_dev->pdev = &pdev->dev;