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

Commit 434eaf3b authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown
Browse files

spi: ep93xx: use devm_spi_register_master() 



Use devm_spi_register_master() to make cleanup paths simpler.

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

drivers/spi/spi-ep93xx.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -942,7 +942,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev) 
	/* make sure that the hardware is disabled */

	/* make sure that the hardware is disabled */

	ep93xx_spi_write_u8(espi, SSPCR1, 0);

	ep93xx_spi_write_u8(espi, SSPCR1, 0);





	error = spi_register_master(master);

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

	if (error) {

	if (error) {

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

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

		goto fail_free_dma;

		goto fail_free_dma;
@@ -968,7 +968,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev) 




	ep93xx_spi_release_dma(espi);

	ep93xx_spi_release_dma(espi);





	spi_unregister_master(master);

	return 0;

	return 0;

}

}