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

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 6adf4e35816d..ee6e61cbf7f5 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -536,7 +536,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
         if (ret < 0)
                 goto free_clock;
 
-        ret = spi_register_master(master);
+        ret = devm_spi_register_master(dev, master);
         if (ret < 0)
                 goto free_clock;
 
@@ -559,12 +559,10 @@ static int mpc512x_psc_spi_do_remove(struct device *dev)
         struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
         struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
 
-        spi_unregister_master(master);
         clk_disable_unprepare(mps->clk_mclk);
         free_irq(mps->irq, mps);
         if (mps->psc)
                 iounmap(mps->psc);
-        spi_master_put(master);
 
         return 0;
 }