From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 24 Sep 2013 04:37:23 +0000 (+0900)
Subject: spi: omap-100k: use devm_spi_register_master()
X-Git-Tag: next-20131017~33^2~8^2^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c4c5c7be116b0cce2e71173158060afac4144d0;p=karo-tx-linux.git

spi: omap-100k: 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-omap-100k.c b/drivers/spi/spi-omap-100k.c
index 69ecf05757dd..b6ed82beb01d 100644
--- a/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@ -457,7 +457,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	status = spi_register_master(master);
+	status = devm_spi_register_master(&pdev->dev, master);
 	if (status < 0)
 		goto err;
 
@@ -485,8 +485,6 @@ static int omap1_spi100k_remove(struct platform_device *pdev)
 
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-	spi_unregister_master(master);
-
 	return 0;
 }