Unverified Commit 5dee8bb8 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Mark Brown
Browse files

spi: mt65xx: Move clock parent setting to remove clock disable gotos 



Reparenting sel_clk to parent_clk can be done before enabling any of
spi_clk and spi_hclk. Move the call to clk_set_parent() for sel_clk
earlier, and call disable_unprepare() upon spi_clk prepare_enable()
failure to remove all clock disablement related gotos.
This commit is in preparation of a later cleanup.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220407114428.167091-5-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6b444058

drivers/spi/spi-mt65xx.c

+8 −11
Original line number Diff line number Diff line
@@ -1195,6 +1195,12 @@ static int mtk_spi_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk);

	if (ret < 0) {

		dev_err(dev, "failed to clk_set_parent (%d)\n", ret);

		return ret;

	}



	ret = clk_prepare_enable(mdata->spi_hclk);

	if (ret < 0) {

		dev_err(dev, "failed to enable hclk (%d)\n", ret);
@@ -1204,13 +1210,8 @@ static int mtk_spi_probe(struct platform_device *pdev) 
	ret = clk_prepare_enable(mdata->spi_clk);

	if (ret < 0) {

		dev_err(dev, "failed to enable spi_clk (%d)\n", ret);

		goto err_disable_spi_hclk;

	}



	ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk);

	if (ret < 0) {

		dev_err(dev, "failed to clk_set_parent (%d)\n", ret);

		goto err_disable_spi_clk;

		clk_disable_unprepare(mdata->spi_hclk);

		return ret;

	}



	mdata->spi_clk_hz = clk_get_rate(mdata->spi_clk);
@@ -1261,10 +1262,6 @@ static int mtk_spi_probe(struct platform_device *pdev) 


err_disable_runtime_pm:

	pm_runtime_disable(dev);

err_disable_spi_clk:

	clk_disable_unprepare(mdata->spi_clk);

err_disable_spi_hclk:

	clk_disable_unprepare(mdata->spi_hclk);



	return ret;

}