aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-24 00:27:48 -0400
committerMark Brown <broonie@linaro.org>2013-09-26 06:42:31 -0400
commitc493fc4bbd4f27b1a8a141648df866c386441b70 (patch)
treea0dd2a990acb487a30829072e7e892de8ffa23b1
parent6221df6d88b847da0803b2ced7826f005e62c837 (diff)
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>
-rw-r--r--drivers/spi/spi-clps711x.c4
1 files changed, 1 insertions, 3 deletions
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)
230 goto clk_out; 230 goto clk_out;
231 } 231 }
232 232
233 ret = spi_register_master(master); 233 ret = devm_spi_register_master(&pdev->dev, master);
234 if (!ret) { 234 if (!ret) {
235 dev_info(&pdev->dev, 235 dev_info(&pdev->dev,
236 "SPI bus driver initialized. Master clock %u Hz\n", 236 "SPI bus driver initialized. Master clock %u Hz\n",
@@ -261,8 +261,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
261 if (gpio_is_valid(hw->chipselect[i])) 261 if (gpio_is_valid(hw->chipselect[i]))
262 gpio_free(hw->chipselect[i]); 262 gpio_free(hw->chipselect[i]);
263 263
264 spi_unregister_master(master);
265
266 return 0; 264 return 0;
267} 265}
268 266