1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 20dd71237d3b..8bed27a4108c 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1428,9 +1428,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
                S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
                sdd->regs + S3C64XX_SPI_INT_EN);
 
-        if (spi_register_master(master)) {
-                dev_err(&pdev->dev, "cannot register SPI master\n");
-                ret = -EBUSY;
+        ret = devm_spi_register_master(&pdev->dev, master);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
                 goto err3;
         }
 
@@ -1461,16 +1461,12 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 
         pm_runtime_disable(&pdev->dev);
 
-        spi_unregister_master(master);
-
         writel(0, sdd->regs + S3C64XX_SPI_INT_EN);
 
         clk_disable_unprepare(sdd->src_clk);
 
         clk_disable_unprepare(sdd->clk);
 
-        spi_master_put(master);
-
         return 0;
 }