diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-28 15:35:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-29 18:00:21 +0100 |
| commit | 3e00a09d2fbd64f0ad98e7c8c29dbf9e038fc746 (patch) | |
| tree | 948ff336c831386b548f3d8d7c2acf9ff91079d0 /drivers/spi/spi-sh-hspi.c | |
| parent | 7dd62787334ac6e0e2a0ef3f20bb1936ac431b04 (diff) | |
| download | linux-3e00a09d2fbd64f0ad98e7c8c29dbf9e038fc746.tar.bz2 | |
spi/hspi: Convert to core runtime PM
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-sh-hspi.c')
| -rw-r--r-- | drivers/spi/spi-sh-hspi.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index 716edf999538..b95d6a9fb80e 100644 --- a/drivers/spi/spi-sh-hspi.c +++ b/drivers/spi/spi-sh-hspi.c @@ -99,21 +99,6 @@ static int hspi_status_check_timeout(struct hspi_priv *hspi, u32 mask, u32 val) /* * spi master function */ -static int hspi_prepare_transfer(struct spi_master *master) -{ - struct hspi_priv *hspi = spi_master_get_devdata(master); - - pm_runtime_get_sync(hspi->dev); - return 0; -} - -static int hspi_unprepare_transfer(struct spi_master *master) -{ - struct hspi_priv *hspi = spi_master_get_devdata(master); - - pm_runtime_put_sync(hspi->dev); - return 0; -} #define hspi_hw_cs_enable(hspi) hspi_hw_cs_ctrl(hspi, 0) #define hspi_hw_cs_disable(hspi) hspi_hw_cs_ctrl(hspi, 1) @@ -316,9 +301,8 @@ static int hspi_probe(struct platform_device *pdev) master->setup = hspi_setup; master->cleanup = hspi_cleanup; master->mode_bits = SPI_CPOL | SPI_CPHA; - master->prepare_transfer_hardware = hspi_prepare_transfer; + master->auto_runtime_pm = true; master->transfer_one_message = hspi_transfer_one_message; - master->unprepare_transfer_hardware = hspi_unprepare_transfer; ret = spi_register_master(master); if (ret < 0) { dev_err(&pdev->dev, "spi_register_master error.\n"); |