@@ -1361,8 +1361,10 @@ static int vchiq_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mgmt);
ret = vchiq_platform_init(pdev, &mgmt->state);
- if (ret)
- goto failed_platform_init;
+ if (ret) {
+ dev_err(&pdev->dev, "arm: Could not initialize vchiq platform\n");
+ return ret;
+ }
vchiq_debugfs_init(&mgmt->state);
@@ -1376,18 +1378,13 @@ static int vchiq_probe(struct platform_device *pdev)
ret = vchiq_register_chrdev(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "arm: Failed to initialize vchiq cdev\n");
- goto error_exit;
+ return ret;
}
bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio");
bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera");
return 0;
-
-failed_platform_init:
- dev_err(&pdev->dev, "arm: Could not initialize vchiq platform\n");
-error_exit:
- return ret;
}
static void vchiq_remove(struct platform_device *pdev)
The 'failed_platform_init' and 'error_exit' labels do not simplify the code, there is a single jump to them in the code, and the actions taken from then on can be easily carried out where the goto occurs. Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> --- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)