spi: dw: Remove runtime PM enable/disable from common part of the driver

Committed version of the commit b9fc2d207e54 ("spi: dw: Move runtime PM
enable/disable from common to platform driver part") does not include by
some reason changes to drivers/spi/spi-dw.c that were part of the original
patch sent to the mailing list.

Complete the code move by doing those changes now.

Fixes: b9fc2d207e54 ("spi: dw: Move runtime PM enable/disable from common to platform driver part")
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Link: https://lore.kernel.org/r/20191030113137.15459-1-jarkko.nikula@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 54ed6eb3e25242861bb147d0e1fdf53491dbcd57..466f5c67843b21a7cd9182227ffe6bbeb31f3422 100644 (file)
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/highmem.h>
 #include <linux/delay.h>
-#include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
 
@@ -499,8 +498,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
        if (dws->set_cs)
                master->set_cs = dws->set_cs;
 
-       pm_runtime_enable(dev);
-
        /* Basic HW init */
        spi_hw_init(dev, dws);
 
@@ -529,7 +526,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
        spi_enable_chip(dws, 0);
        free_irq(dws->irq, master);
 err_free_master:
-       pm_runtime_disable(dev);
        spi_controller_put(master);
        return ret;
 }
@@ -544,9 +540,6 @@ void dw_spi_remove_host(struct dw_spi *dws)
 
        spi_shutdown_chip(dws);
 
-       if (dws->master)
-               pm_runtime_disable(&dws->master->dev);
-
        free_irq(dws->irq, dws->master);
 }
 EXPORT_SYMBOL_GPL(dw_spi_remove_host);