Unverified Commit 76f0030f authored Oct 30, 2019 by Jarkko Nikula Committed by Mark Brown Oct 30, 2019

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: 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>

parent 1d00a67c

drivers/spi/spi-dw.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -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 @@ err_dma_exit:
		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);