diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 14:49:06 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 14:49:06 +0200 |
| commit | 85cac431329bd09f7d30d489591d7af0d658b008 (patch) | |
| tree | 8e81e687c9104c297b9d985e2c5f37f05a6e4b83 /drivers/spi/spi-coldfire-qspi.c | |
| parent | Merge remote-tracking branch 'spi/topic/pxa' into spi-next (diff) | |
| parent | spi/qspi: fix missing unlock on error in ti_qspi_start_transfer_one() (diff) | |
| download | linux-85cac431329bd09f7d30d489591d7af0d658b008.tar.xz linux-85cac431329bd09f7d30d489591d7af0d658b008.zip | |
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
Diffstat (limited to 'drivers/spi/spi-coldfire-qspi.c')
| -rw-r--r-- | drivers/spi/spi-coldfire-qspi.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c index 8e07928cadb3..cc5b75d10c38 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c @@ -354,24 +354,6 @@ static int mcfqspi_transfer_one_message(struct spi_master *master, } -static int mcfqspi_prepare_transfer_hw(struct spi_master *master) -{ - struct mcfqspi *mcfqspi = spi_master_get_devdata(master); - - pm_runtime_get_sync(mcfqspi->dev); - - return 0; -} - -static int mcfqspi_unprepare_transfer_hw(struct spi_master *master) -{ - struct mcfqspi *mcfqspi = spi_master_get_devdata(master); - - pm_runtime_put_sync(mcfqspi->dev); - - return 0; -} - static int mcfqspi_setup(struct spi_device *spi) { if (spi->chip_select >= spi->master->num_chipselect) { @@ -473,8 +455,7 @@ static int mcfqspi_probe(struct platform_device *pdev) master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16); master->setup = mcfqspi_setup; master->transfer_one_message = mcfqspi_transfer_one_message; - master->prepare_transfer_hardware = mcfqspi_prepare_transfer_hw; - master->unprepare_transfer_hardware = mcfqspi_unprepare_transfer_hw; + master->auto_runtime_pm = true; platform_set_drvdata(pdev, master); |