Unverified Commit c934fec1 authored by Mason Zhang's avatar Mason Zhang Committed by Mark Brown
Browse files

spi: mediatek: move devm_spi_register_master position 



This patch move devm_spi_register_master to the end of mtk_spi_probe.
If slaves call spi_sync in there probe function, master should have probe done.

Signed-off-by: default avatarMason Zhang <Mason.Zhang@mediatek.com>
Link: https://lore.kernel.org/r/20210713114247.1536-1-mason.zhang@mediatek.com


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

drivers/spi/spi-mt65xx.c

+6 −6
Original line number Diff line number Diff line
@@ -803,12 +803,6 @@ static int mtk_spi_probe(struct platform_device *pdev) 


	pm_runtime_enable(&pdev->dev);



	ret = devm_spi_register_master(&pdev->dev, master);

	if (ret) {

		dev_err(&pdev->dev, "failed to register master (%d)\n", ret);

		goto err_disable_runtime_pm;

	}



	if (mdata->dev_comp->need_pad_sel) {

		if (mdata->pad_num != master->num_chipselect) {

			dev_err(&pdev->dev,
@@ -848,6 +842,12 @@ static int mtk_spi_probe(struct platform_device *pdev) 
		dev_notice(&pdev->dev, "SPI dma_set_mask(%d) failed, ret:%d\n",

			   addr_bits, ret);



	ret = devm_spi_register_master(&pdev->dev, master);

	if (ret) {

		dev_err(&pdev->dev, "failed to register master (%d)\n", ret);

		goto err_disable_runtime_pm;

	}



	return 0;



err_disable_runtime_pm: