Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e195ac authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown
Browse files

spi: mxs: use devm_spi_register_master() 



Use devm_spi_register_master() to make cleanup paths simpler,
and remove a duplicate put.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent eaa24297

drivers/spi/spi-mxs.c

+1 −3
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int mxs_spi_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, master);



	ret = spi_register_master(master);

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

	if (ret) {

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

		goto out_disable_clk;
@@ -598,10 +598,8 @@ static int mxs_spi_remove(struct platform_device *pdev) 
	spi = spi_master_get_devdata(master);

	ssp = &spi->ssp;



	spi_unregister_master(master);

	clk_disable_unprepare(ssp->clk);

	dma_release_channel(ssp->dmach);

	spi_master_put(master);



	return 0;

}