commit 9e03d05eee4ca45ed12749ef6c26bf616262cdd2
author Jingoo Han <jg1.han@samsung.com> Wed Dec 04 14:13:50 2013 +0900
committer Mark Brown <broonie@linaro.org> Mon Dec 09 17:59:58 2013 +0000
tree 1ecbcedec82171bd21a4a619c66a48326f474a61
parent e80b89ee2ace3a959c44c834231851fc5242eb13

spi: rcar: Use devm_spi_register_master()

Use devm_spi_register_master() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

drivers/spi/spi-rspi.c

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 19c65c4..cfdbb42 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -887,7 +887,6 @@
 {
 	struct rspi_data *rspi = platform_get_drvdata(pdev);
 
-	spi_unregister_master(rspi->master);
 	rspi_release_dma(rspi);
 
 	return 0;
@@ -972,7 +971,7 @@
 		goto error2;
 	}
 
-	ret = spi_register_master(master);
+	ret = devm_spi_register_master(&pdev->dev, master);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "spi_register_master error.\n");
 		goto error2;