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

Message ID 20191030113137.15459-1-jarkko.nikula@linux.intel.com
State Accepted
Commit 76f0030f367c61d4d1f4b1393ff3d9dc43d20c6a
Headers show
Series
  • spi: dw: Remove runtime PM enable/disable from common part of the driver
Related show

Commit Message

Jarkko Nikula Oct. 30, 2019, 11:31 a.m. UTC
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>
---
 drivers/spi/spi-dw.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

Mark Brown Oct. 30, 2019, 11:33 a.m. UTC | #1
On Wed, Oct 30, 2019 at 01:31:37PM +0200, Jarkko Nikula wrote:
> 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.

This will be because they look like already applied changes on the
branch...
Jarkko Nikula Oct. 30, 2019, 11:47 a.m. UTC | #2
On 10/30/19 1:33 PM, Mark Brown wrote:
> On Wed, Oct 30, 2019 at 01:31:37PM +0200, Jarkko Nikula wrote:
>> 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.
> 
> This will be because they look like already applied changes on the
> branch...
> 
I see only Phil's 1e6959832510 ("spi: dw: Add basic runtime PM support") 
to be latest for spi-dw.c in for-next branch.

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git/log/drivers/spi/spi-dw.c?h=for-next
Mark Brown Oct. 30, 2019, 12:46 p.m. UTC | #3
On Wed, Oct 30, 2019 at 01:47:42PM +0200, Jarkko Nikula wrote:
> On 10/30/19 1:33 PM, Mark Brown wrote:

> > This will be because they look like already applied changes on the
> > branch...

> I see only Phil's 1e6959832510 ("spi: dw: Add basic runtime PM support") to
> be latest for spi-dw.c in for-next branch.

Weird.  I didn't do anything explicitly so it's something git decided to
do for itself when applying...  let's see what happens with this.

Patch
diff mbox series

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 54ed6eb3e252..466f5c67843b 100644
--- 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);