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

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 64e1682c39b1..cb0e1f1137ad 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1201,7 +1201,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
 
         /* Register with the SPI framework */
         platform_set_drvdata(pdev, drv_data);
-        status = spi_register_master(master);
+        status = devm_spi_register_master(&pdev->dev, master);
         if (status != 0) {
                 dev_err(&pdev->dev, "problem registering spi master\n");
                 goto out_error_clock_enabled;
@@ -1253,9 +1253,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev)
         /* Release SSP */
         pxa_ssp_free(ssp);
 
-        /* Disconnect from the SPI framework */
-        spi_unregister_master(drv_data->master);
-
         return 0;
 }