Commit 76f0030f authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown

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

Committed version of the commit b9fc2d20 ("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: b9fc2d20 ("spi: dw: Move runtime PM enable/disable from common to platform driver part")
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Link: https://lore.kernel.org/r/20191030113137.15459-1-jarkko.nikula@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1d00a67c
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pm_runtime.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
...@@ -499,8 +498,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) ...@@ -499,8 +498,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
if (dws->set_cs) if (dws->set_cs)
master->set_cs = dws->set_cs; master->set_cs = dws->set_cs;
pm_runtime_enable(dev);
/* Basic HW init */ /* Basic HW init */
spi_hw_init(dev, dws); spi_hw_init(dev, dws);
...@@ -529,7 +526,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) ...@@ -529,7 +526,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
spi_enable_chip(dws, 0); spi_enable_chip(dws, 0);
free_irq(dws->irq, master); free_irq(dws->irq, master);
err_free_master: err_free_master:
pm_runtime_disable(dev);
spi_controller_put(master); spi_controller_put(master);
return ret; return ret;
} }
...@@ -544,9 +540,6 @@ void dw_spi_remove_host(struct dw_spi *dws) ...@@ -544,9 +540,6 @@ void dw_spi_remove_host(struct dw_spi *dws)
spi_shutdown_chip(dws); spi_shutdown_chip(dws);
if (dws->master)
pm_runtime_disable(&dws->master->dev);
free_irq(dws->irq, dws->master); free_irq(dws->irq, dws->master);
} }
EXPORT_SYMBOL_GPL(dw_spi_remove_host); EXPORT_SYMBOL_GPL(dw_spi_remove_host);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment