Merge remote-tracking branch 'spi/topic/devm' into spi-qspi

Conflicts:
	drivers/spi/spi-ti-qspi.c

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index a61aeb9bb823..0b71270fbf67 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -504,7 +504,7 @@ static int ti_qspi_probe(struct platform_device *pdev)
         if (!of_property_read_u32(np, "spi-max-frequency", &max_freq))
                 qspi->spi_max_frequency = max_freq;
 
-        ret = spi_register_master(master);
+        ret = devm_spi_register_master(&pdev->dev, master);
         if (ret)
                 goto free_master;
 
@@ -520,7 +520,6 @@ static int ti_qspi_remove(struct platform_device *pdev)
         struct  ti_qspi *qspi = platform_get_drvdata(pdev);
 
         ti_qspi_write(qspi, QSPI_WC_INT_DISABLE, QSPI_INTR_ENABLE_CLEAR_REG);
-        spi_unregister_master(qspi->master);
 
         return 0;
 }
@@ -531,7 +530,7 @@ static const struct dev_pm_ops ti_qspi_pm_ops = {
 
 static struct platform_driver ti_qspi_driver = {
         .probe  = ti_qspi_probe,
-        .remove = ti_qspi_remove,
+        .remove = ti_qspi_remove,
         .driver = {
                 .name   = "ti,dra7xxx-qspi",
                 .owner  = THIS_MODULE,