diff options
author | Andy Shevchenko | 2015-10-14 22:12:23 +0200 |
---|---|---|
committer | Mark Brown | 2015-10-19 21:32:01 +0200 |
commit | 1cc3f141f0cb5a822cdef30fb1d92ae6f4176bfa (patch) | |
tree | 1d3bfb1afa2c139db80fcdd232f38ef841777911 | |
parent | spi: dw: eliminate unused threshold variables (diff) | |
download | kernel-qcow2-linux-1cc3f141f0cb5a822cdef30fb1d92ae6f4176bfa.tar.gz kernel-qcow2-linux-1cc3f141f0cb5a822cdef30fb1d92ae6f4176bfa.tar.xz kernel-qcow2-linux-1cc3f141f0cb5a822cdef30fb1d92ae6f4176bfa.zip |
spi: dw: introduce spi_shutdown_chip()
This helper disables SPI controller and sets clock to 0.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-dw.c | 13 | ||||
-rw-r--r-- | drivers/spi/spi-dw.h | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index c8e7715097e7..a730c353d3bf 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -546,22 +546,21 @@ void dw_spi_remove_host(struct dw_spi *dws) if (dws->dma_ops && dws->dma_ops->dma_exit) dws->dma_ops->dma_exit(dws); - spi_enable_chip(dws, 0); - /* Disable clk */ - spi_set_clk(dws, 0); + + spi_shutdown_chip(dws); } EXPORT_SYMBOL_GPL(dw_spi_remove_host); int dw_spi_suspend_host(struct dw_spi *dws) { - int ret = 0; + int ret; ret = spi_master_suspend(dws->master); if (ret) return ret; - spi_enable_chip(dws, 0); - spi_set_clk(dws, 0); - return ret; + + spi_shutdown_chip(dws); + return 0; } EXPORT_SYMBOL_GPL(dw_spi_suspend_host); diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index b75ed327d5a2..35589a270468 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -225,6 +225,12 @@ static inline void spi_reset_chip(struct dw_spi *dws) spi_enable_chip(dws, 1); } +static inline void spi_shutdown_chip(struct dw_spi *dws) +{ + spi_enable_chip(dws, 0); + spi_set_clk(dws, 0); +} + /* * Each SPI slave device to work with dw_api controller should * has such a structure claiming its working mode (poll or PIO/DMA), |