aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-s3c64xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-28 10:24:54 -0400
committerMark Brown <broonie@linaro.org>2013-07-29 13:00:22 -0400
commitfc0f81b76a6e5c1f1c5e672420595347d846b2f9 (patch)
tree0fdaadaf2f3394bbc94814a6551f1d6278ae2dad /drivers/spi/spi-s3c64xx.c
parent3e00a09d2fbd64f0ad98e7c8c29dbf9e038fc746 (diff)
spi/s3c64xx: Use core for runtime PM
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-s3c64xx.c')
-rw-r--r--drivers/spi/spi-s3c64xx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 63e2070c6c14..a73d0a3a35df 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -356,8 +356,6 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
356 while (!is_polling(sdd) && !acquire_dma(sdd)) 356 while (!is_polling(sdd) && !acquire_dma(sdd))
357 usleep_range(10000, 11000); 357 usleep_range(10000, 11000);
358 358
359 pm_runtime_get_sync(&sdd->pdev->dev);
360
361 return 0; 359 return 0;
362} 360}
363 361
@@ -372,7 +370,6 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi)
372 sdd->ops->release((enum dma_ch)sdd->tx_dma.ch, 370 sdd->ops->release((enum dma_ch)sdd->tx_dma.ch,
373 &s3c64xx_spi_dma_client); 371 &s3c64xx_spi_dma_client);
374 } 372 }
375 pm_runtime_put(&sdd->pdev->dev);
376 373
377 return 0; 374 return 0;
378} 375}
@@ -1395,6 +1392,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
1395 SPI_BPW_MASK(8); 1392 SPI_BPW_MASK(8);
1396 /* the spi->mode bits understood by this driver: */ 1393 /* the spi->mode bits understood by this driver: */
1397 master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; 1394 master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
1395 master->auto_runtime_pm = true;
1398 1396
1399 sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res); 1397 sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res);
1400 if (IS_ERR(sdd->regs)) { 1398 if (IS_ERR(sdd->regs)) {