Merge remote-tracking branch 'spi/topic/bfin' into spi-next

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 6416798828e7..7f2fd33ad4d9 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -229,7 +229,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",
@@ -260,8 +260,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;
 }