summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-tegra20-sflash.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-28 18:37:46 +0400
committerMark Brown <broonie@linaro.org>2013-07-29 21:00:26 +0400
commit38315fd48d3de6e9a53b86dfd27684970cd092e9 (patch)
tree75b120c76833ee19f95ce2418597378bb92ee9f4 /drivers/spi/spi-tegra20-sflash.c
parent612aa5ced770b7ec02d37dd63fd4c7dd2f6e5f37 (diff)
downloadlinux-38315fd48d3de6e9a53b86dfd27684970cd092e9.tar.xz
spi/tegra20-sflash: Use core runtime PM
Signed-off-by: Mark Brown <broonie@linaro.org> Reviewed-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers/spi/spi-tegra20-sflash.c')
-rw-r--r--drivers/spi/spi-tegra20-sflash.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index f871c4ee6ad7..1d814dc6e000 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -325,20 +325,6 @@ static int tegra_sflash_setup(struct spi_device *spi)
return 0;
}
-static int tegra_sflash_prepare_transfer(struct spi_master *spi)
-{
- struct tegra_sflash_data *tsd = spi_master_get_devdata(spi);
- int ret;
-
- ret = pm_runtime_get_sync(tsd->dev);
- if (ret < 0) {
- dev_err(tsd->dev, "runtime PM get failed: %d\n", ret);
- return ret;
- }
-
- return ret;
-}
-
static int tegra_sflash_transfer_one_message(struct spi_master *master,
struct spi_message *msg)
{
@@ -391,15 +377,6 @@ exit:
return ret;
}
-static int tegra_sflash_unprepare_transfer(struct spi_master *spi)
-{
- struct tegra_sflash_data *tsd = spi_master_get_devdata(spi);
-
- pm_runtime_put(tsd->dev);
-
- return 0;
-}
-
static irqreturn_t handle_cpu_based_xfer(struct tegra_sflash_data *tsd)
{
struct spi_transfer *t = tsd->curr_xfer;
@@ -492,9 +469,8 @@ static int tegra_sflash_probe(struct platform_device *pdev)
/* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA;
master->setup = tegra_sflash_setup;
- master->prepare_transfer_hardware = tegra_sflash_prepare_transfer;
master->transfer_one_message = tegra_sflash_transfer_one_message;
- master->unprepare_transfer_hardware = tegra_sflash_unprepare_transfer;
+ master->auto_runtime_pm = true;
master->num_chipselect = MAX_CHIP_SELECT;
master->bus_num = -1;