summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-28 16:37:59 +0200
committerMark Brown <broonie@linaro.org>2013-07-29 19:00:30 +0200
commitce74ac80d25bcb1bf5c6638cf376054c9b7c4b0b (patch)
tree463164726b8316209b1dd1807f5a6ca01b8dd89f /drivers
parentspi/tegra20-sflash: Use core runtime PM (diff)
downloadlinux-ce74ac80d25bcb1bf5c6638cf376054c9b7c4b0b.tar.xz
linux-ce74ac80d25bcb1bf5c6638cf376054c9b7c4b0b.zip
spi/tegra20-slink: Use core runtime PM
Signed-off-by: Mark Brown <broonie@linaro.org> Reviewed-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-tegra20-slink.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index b2fb115df027..c70353672a23 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -824,20 +824,6 @@ static int tegra_slink_setup(struct spi_device *spi)
return 0;
}
-static int tegra_slink_prepare_transfer(struct spi_master *spi)
-{
- struct tegra_slink_data *tspi = spi_master_get_devdata(spi);
- int ret;
-
- ret = pm_runtime_get_sync(tspi->dev);
- if (ret < 0) {
- dev_err(tspi->dev, "runtime PM get failed: %d\n", ret);
- return ret;
- }
-
- return ret;
-}
-
static int tegra_slink_transfer_one_message(struct spi_master *master,
struct spi_message *msg)
{
@@ -892,15 +878,6 @@ exit:
return ret;
}
-static int tegra_slink_unprepare_transfer(struct spi_master *spi)
-{
- struct tegra_slink_data *tspi = spi_master_get_devdata(spi);
-
- pm_runtime_put(tspi->dev);
-
- return 0;
-}
-
static irqreturn_t handle_cpu_based_xfer(struct tegra_slink_data *tspi)
{
struct spi_transfer *t = tspi->curr_xfer;
@@ -1101,9 +1078,8 @@ static int tegra_slink_probe(struct platform_device *pdev)
/* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
master->setup = tegra_slink_setup;
- master->prepare_transfer_hardware = tegra_slink_prepare_transfer;
master->transfer_one_message = tegra_slink_transfer_one_message;
- master->unprepare_transfer_hardware = tegra_slink_unprepare_transfer;
+ master->auto_runtime_pm = true;
master->num_chipselect = MAX_CHIP_SELECT;
master->bus_num = -1;