Unverified Commit 26c86341 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Mark Brown
Browse files

spi: tegra20-slink: Don't use resource-managed spi_register helper 



Don't use resource-managed spi_register helper to correct the driver
removal order and make it to match the error unwinding order of the
probe function.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210731192731.5869-2-digetx@gmail.com


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

drivers/spi/spi-tegra20-slink.c

+5 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ static int tegra_slink_probe(struct platform_device *pdev) 
	tegra_slink_writel(tspi, tspi->def_command2_reg, SLINK_COMMAND2);



	master->dev.of_node = pdev->dev.of_node;

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

	ret = spi_register_master(master);

	if (ret < 0) {

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

		goto exit_free_irq;
@@ -1142,6 +1142,8 @@ static int tegra_slink_remove(struct platform_device *pdev) 
	struct spi_master *master = platform_get_drvdata(pdev);

	struct tegra_slink_data	*tspi = spi_master_get_devdata(master);



	spi_unregister_master(master);



	free_irq(tspi->irq, tspi);



	pm_runtime_disable(&pdev->dev);
@@ -1152,6 +1154,8 @@ static int tegra_slink_remove(struct platform_device *pdev) 
	if (tspi->rx_dma_chan)

		tegra_slink_deinit_dma_param(tspi, true);



	spi_master_put(master);



	return 0;

}