mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 03:20:25 -04:00
staging: vchiq_arm: refactor goto instructions in vchiq_probe()
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> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> Link: https://lore.kernel.org/r/20241014-vchiq_arm-of_node_put-v2-1-cafe0a4c2666@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
4dfcc5fd0f
commit
76c29a2e0e
@@ -1357,8 +1357,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);
|
||||
|
||||
@@ -1372,18 +1374,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)
|
||||
|
||||
Reference in New Issue
Block a user