1 files changed, 1 insertions, 7 deletions

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 06ee18956160..286cf8d6764b 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -514,13 +514,9 @@ free_master:
 
 static int ti_qspi_remove(struct platform_device *pdev)
 {
-        struct spi_master *master;
-        struct ti_qspi *qspi;
+        struct ti_qspi *qspi = platform_get_drvdata(pdev);
         int ret;
 
-        master = platform_get_drvdata(pdev);
-        qspi = spi_master_get_devdata(master);
-
         ret = pm_runtime_get_sync(qspi->dev);
         if (ret < 0) {
                 dev_err(qspi->dev, "pm_runtime_get_sync() failed\n");
@@ -532,8 +528,6 @@ static int ti_qspi_remove(struct platform_device *pdev)
         pm_runtime_put(qspi->dev);
         pm_runtime_disable(&pdev->dev);
 
-        spi_unregister_master(master);
-
         return 0;
 }