summaryrefslogtreecommitdiff
path: root/drivers/media/platform/davinci/vpbe.c
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2016-10-11 08:43:25 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-11-16 12:20:43 -0200
commit9d2fe9ae298d6144546e168d4b0067b2340ec246 (patch)
treec5011e14fe2d8964da1916c15cf3723cd42d4078 /drivers/media/platform/davinci/vpbe.c
parent135387513d1b0d35baa0433dfa9acc1fb9d97e40 (diff)
[media] DaVinci-VPBE: Return an error code only as a constant in vpbe_probe()
* 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>
Diffstat (limited to 'drivers/media/platform/davinci/vpbe.c')
-rw-r--r--drivers/media/platform/davinci/vpbe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index c8c69442c793..3ac4ba35832a 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -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);