evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] drivers/media/platform/davinci/vpbe.c: Remove unused label and rename remaining labels

Browse source 
Remove unused label and rename remaining labels

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Peter Senna Tschudin 2012-09-14 12:46:52 -03:00 • committed by Mauro Carvalho Chehab
parent 20eb13a77e
commit ac0fe5ba7f
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/media/platform/davinci/vpbe.c
View file

@ -610,11 +610,11 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
vpbe_dev->dac_clk = clk_get(vpbe_dev->pdev, "vpss_dac"); vpbe_dev->dac_clk = clk_get(vpbe_dev->pdev, "vpss_dac");
if (IS_ERR(vpbe_dev->dac_clk)) { if (IS_ERR(vpbe_dev->dac_clk)) {
ret = PTR_ERR(vpbe_dev->dac_clk); ret = PTR_ERR(vpbe_dev->dac_clk);
goto vpbe_unlock; goto fail_mutex_unlock;
} }
if (clk_enable(vpbe_dev->dac_clk)) { if (clk_enable(vpbe_dev->dac_clk)) {
ret = -ENODEV; ret = -ENODEV;
goto vpbe_unlock; goto fail_mutex_unlock;
} }
} }
@ -626,7 +626,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
if (ret) { if (ret) {
v4l2_err(dev->driver, v4l2_err(dev->driver,
"Unable to register v4l2 device.\n"); "Unable to register v4l2 device.\n");
goto vpbe_fail_clock; goto fail_clk_put;
} }
v4l2_info(&vpbe_dev->v4l2_dev, "vpbe v4l2 device registered\n"); v4l2_info(&vpbe_dev->v4l2_dev, "vpbe v4l2 device registered\n");
@ -642,7 +642,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
v4l2_err(&vpbe_dev->v4l2_dev, v4l2_err(&vpbe_dev->v4l2_dev,
"vpbe unable to init venc sub device\n"); "vpbe unable to init venc sub device\n");
ret = -ENODEV; ret = -ENODEV;
goto vpbe_fail_v4l2_device; goto fail_dev_unregister;
} }
/* initialize osd device */ /* initialize osd device */
osd_device = vpbe_dev->osd_device; osd_device = vpbe_dev->osd_device;
@ -653,7 +653,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
v4l2_err(&vpbe_dev->v4l2_dev, v4l2_err(&vpbe_dev->v4l2_dev,
"unable to initialize the OSD device"); "unable to initialize the OSD device");
err = -ENOMEM; err = -ENOMEM;
goto vpbe_fail_v4l2_device; goto fail_dev_unregister;
} }
} }
@ -669,7 +669,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
v4l2_err(&vpbe_dev->v4l2_dev, v4l2_err(&vpbe_dev->v4l2_dev,
"unable to allocate memory for encoders sub devices"); "unable to allocate memory for encoders sub devices");
ret = -ENOMEM; ret = -ENOMEM;
goto vpbe_fail_v4l2_device; goto fail_dev_unregister;
} }
i2c_adap = i2c_get_adapter(vpbe_dev->cfg->i2c_adapter_id); i2c_adap = i2c_get_adapter(vpbe_dev->cfg->i2c_adapter_id);
@ -695,7 +695,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
" failed to register", " failed to register",
enc_info->module_name); enc_info->module_name);
ret = -ENODEV; ret = -ENODEV;
goto vpbe_fail_sd_register; goto fail_kfree_encoders;
} }
} else } else
v4l2_warn(&vpbe_dev->v4l2_dev, "non-i2c encoders" v4l2_warn(&vpbe_dev->v4l2_dev, "non-i2c encoders"
@ -714,7 +714,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
"amplifier %s failed to register", "amplifier %s failed to register",
amp_info->module_name); amp_info->module_name);
ret = -ENODEV; ret = -ENODEV;
goto vpbe_fail_amp_register; goto fail_kfree_encoders;
} }
v4l2_info(&vpbe_dev->v4l2_dev, v4l2_info(&vpbe_dev->v4l2_dev,
"v4l2 sub device %s registered\n", "v4l2 sub device %s registered\n",
@ -754,15 +754,14 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
/* TBD handling of bootargs for default output and mode */ /* TBD handling of bootargs for default output and mode */
return 0; return 0;
vpbe_fail_amp_register: fail_kfree_encoders:
vpbe_fail_sd_register:
kfree(vpbe_dev->encoders); kfree(vpbe_dev->encoders);
vpbe_fail_v4l2_device: fail_dev_unregister:
v4l2_device_unregister(&vpbe_dev->v4l2_dev); v4l2_device_unregister(&vpbe_dev->v4l2_dev);
vpbe_fail_clock: fail_clk_put:
if (strcmp(vpbe_dev->cfg->module_name, "dm644x-vpbe-display") != 0) if (strcmp(vpbe_dev->cfg->module_name, "dm644x-vpbe-display") != 0)
clk_put(vpbe_dev->dac_clk); clk_put(vpbe_dev->dac_clk);
vpbe_unlock: fail_mutex_unlock:
mutex_unlock(&vpbe_dev->lock); mutex_unlock(&vpbe_dev->lock);
return ret; return ret;
} }