Commit d61980ad authored by 蒋家盛's avatar 蒋家盛 Committed by Dmitry Baryshkov
Browse files

drm/msm/dsi: Drop the redundant fail label 



Drop the redundant fail label and change the "goto fail" into "return ret"
since they are the same.

Reviewed-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/517816/
Link: https://lore.kernel.org/r/20230111011006.6238-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 115906ca

drivers/gpu/drm/msm/dsi/dsi_host.c

+8 −16
Original line number Diff line number Diff line
@@ -1883,8 +1883,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) 


	msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);

	if (!msm_host) {

		ret = -ENOMEM;

		goto fail;

		return -ENOMEM;

	}



	msm_host->pdev = pdev;
@@ -1893,31 +1892,28 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) 
	ret = dsi_host_parse_dt(msm_host);

	if (ret) {

		pr_err("%s: failed to parse dt\n", __func__);

		goto fail;

		return ret;

	}



	msm_host->ctrl_base = msm_ioremap_size(pdev, "dsi_ctrl", &msm_host->ctrl_size);

	if (IS_ERR(msm_host->ctrl_base)) {

		pr_err("%s: unable to map Dsi ctrl base\n", __func__);

		ret = PTR_ERR(msm_host->ctrl_base);

		goto fail;

		return PTR_ERR(msm_host->ctrl_base);

	}



	pm_runtime_enable(&pdev->dev);



	msm_host->cfg_hnd = dsi_get_config(msm_host);

	if (!msm_host->cfg_hnd) {

		ret = -EINVAL;

		pr_err("%s: get config failed\n", __func__);

		goto fail;

		return -EINVAL;

	}

	cfg = msm_host->cfg_hnd->cfg;



	msm_host->id = dsi_host_get_id(msm_host);

	if (msm_host->id < 0) {

		ret = msm_host->id;

		pr_err("%s: unable to identify DSI host index\n", __func__);

		goto fail;

		return msm_host->id;

	}



	/* fixup base address by io offset */
@@ -1927,19 +1923,18 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) 
					    cfg->regulator_data,

					    &msm_host->supplies);

	if (ret)

		goto fail;

		return ret;



	ret = dsi_clk_init(msm_host);

	if (ret) {

		pr_err("%s: unable to initialize dsi clks\n", __func__);

		goto fail;

		return ret;

	}



	msm_host->rx_buf = devm_kzalloc(&pdev->dev, SZ_4K, GFP_KERNEL);

	if (!msm_host->rx_buf) {

		ret = -ENOMEM;

		pr_err("%s: alloc rx temp buf failed\n", __func__);

		goto fail;

		return -ENOMEM;

	}



	ret = devm_pm_opp_set_clkname(&pdev->dev, "byte");
@@ -1986,9 +1981,6 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) 


	DBG("Dsi Host %d initialized", msm_host->id);

	return 0;



fail:

	return ret;

}



void msm_dsi_host_destroy(struct mipi_dsi_host *host)