aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-05 15:23:06 -0500
committerMark Brown <broonie@kernel.org>2014-12-07 08:47:21 -0500
commitbc88f11baf5a7e6671eac6fe3131c087d71a646f (patch)
tree8b36acdb58dbd9f4332f91928e9e6f5288792cc8 /drivers/spi
parentbf77cba95f8c06bbf76869d3bdfb03e18a33e673 (diff)
spi/s3c64xx: Remove redundant runtime PM management
The device already asks the core to hold a runtime PM reference while it is active so it is redundant to open code that in the driver itself. Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-s3c64xx.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 59e07cf31598..0f602cba1989 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -346,16 +346,8 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
346 spi->dma_tx = sdd->tx_dma.ch; 346 spi->dma_tx = sdd->tx_dma.ch;
347 } 347 }
348 348
349 ret = pm_runtime_get_sync(&sdd->pdev->dev);
350 if (ret < 0) {
351 dev_err(dev, "Failed to enable device: %d\n", ret);
352 goto out_tx;
353 }
354
355 return 0; 349 return 0;
356 350
357out_tx:
358 dma_release_channel(sdd->tx_dma.ch);
359out_rx: 351out_rx:
360 dma_release_channel(sdd->rx_dma.ch); 352 dma_release_channel(sdd->rx_dma.ch);
361out: 353out:
@@ -372,7 +364,6 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi)
372 dma_release_channel(sdd->tx_dma.ch); 364 dma_release_channel(sdd->tx_dma.ch);
373 } 365 }
374 366
375 pm_runtime_put(&sdd->pdev->dev);
376 return 0; 367 return 0;
377} 368}
378 369