[PATCH v3 07/14] drm/panfrost: rename error labels in device_init

[Steven Price]

On 09/07/2020 15:03, Clément Péron wrote:
> Rename goto labels in device_init it will be easier to maintain.
> 
> Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
> Signed-off-by: Clément Péron <peron.clem at gmail.com>

Nice clean up, thanks. As you noted this needs rebasing as the 
"regulator init" message has gone.

Reviewed-by: Steven Price <steven.price at arm.com>

> ---
>   drivers/gpu/drm/panfrost/panfrost_device.c | 30 +++++++++++-----------
>   1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c
> index 8136babd3ba9..cc16d102b275 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_device.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_device.c
> @@ -215,57 +215,57 @@ int panfrost_device_init(struct panfrost_device *pfdev)
>   	err = panfrost_regulator_init(pfdev);
>   	if (err) {
>   		dev_err(pfdev->dev, "regulator init failed %d\n", err);
> -		goto err_out0;
> +		goto out_clk;
>   	}
>   
>   	err = panfrost_reset_init(pfdev);
>   	if (err) {
>   		dev_err(pfdev->dev, "reset init failed %d\n", err);
> -		goto err_out1;
> +		goto out_regulator;
>   	}
>   
>   	err = panfrost_pm_domain_init(pfdev);
>   	if (err)
> -		goto err_out2;
> +		goto out_reset;
>   
>   	res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0);
>   	pfdev->iomem = devm_ioremap_resource(pfdev->dev, res);
>   	if (IS_ERR(pfdev->iomem)) {
>   		dev_err(pfdev->dev, "failed to ioremap iomem\n");
>   		err = PTR_ERR(pfdev->iomem);
> -		goto err_out3;
> +		goto out_pm_domain;
>   	}
>   
>   	err = panfrost_gpu_init(pfdev);
>   	if (err)
> -		goto err_out3;
> +		goto out_pm_domain;
>   
>   	err = panfrost_mmu_init(pfdev);
>   	if (err)
> -		goto err_out4;
> +		goto out_gpu;
>   
>   	err = panfrost_job_init(pfdev);
>   	if (err)
> -		goto err_out5;
> +		goto out_mmu;
>   
>   	err = panfrost_perfcnt_init(pfdev);
>   	if (err)
> -		goto err_out6;
> +		goto out_job;
>   
>   	return 0;
> -err_out6:
> +out_job:
>   	panfrost_job_fini(pfdev);
> -err_out5:
> +out_mmu:
>   	panfrost_mmu_fini(pfdev);
> -err_out4:
> +out_gpu:
>   	panfrost_gpu_fini(pfdev);
> -err_out3:
> +out_pm_domain:
>   	panfrost_pm_domain_fini(pfdev);
> -err_out2:
> +out_reset:
>   	panfrost_reset_fini(pfdev);
> -err_out1:
> +out_regulator:
>   	panfrost_regulator_fini(pfdev);
> -err_out0:
> +out_clk:
>   	panfrost_clk_fini(pfdev);
>   	return err;
>   }
>