From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 24 Sep 2013 04:27:48 +0000 (+0900)
Subject: spi: clps711x: use devm_spi_register_master()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c493fc4bbd4f27b1a8a141648df866c386441b70;p=linux-beck.git

spi: clps711x: 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>
---

diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index b597a92565dc..f2b1a1c33907 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -230,7 +230,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 		goto clk_out;
 	}
 
-	ret = spi_register_master(master);
+	ret = devm_spi_register_master(&pdev->dev, master);
 	if (!ret) {
 		dev_info(&pdev->dev,
 			 "SPI bus driver initialized. Master clock %u Hz\n",
@@ -261,8 +261,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
 		if (gpio_is_valid(hw->chipselect[i]))
 			gpio_free(hw->chipselect[i]);
 
-	spi_unregister_master(master);
-
 	return 0;
 }