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

[karo-tx-linux.git] / drivers / spi / spi-clps711x.c

diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 6416798828e72bc9f5194282f55cf49a37f6809c..7f2fd33ad4d918de4c60263d19840b1c9611c7ec 100644 (file)
--- 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;
 }