summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-tegra114.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-28 15:37:31 +0100
committerMark Brown <broonie@linaro.org>2013-07-29 18:00:23 +0100
commit612aa5ced770b7ec02d37dd63fd4c7dd2f6e5f37 (patch)
tree254d70793dffe48e99f252dbba8ad81204214075 /drivers/spi/spi-tegra114.c
parentfc0f81b76a6e5c1f1c5e672420595347d846b2f9 (diff)
downloadlinux-612aa5ced770b7ec02d37dd63fd4c7dd2f6e5f37.tar.bz2
spi/tegra114: 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-tegra114.c')
-rw-r--r--drivers/spi/spi-tegra114.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index d85882da8532..c14e30c8af2e 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -803,20 +803,6 @@ static int tegra_spi_setup(struct spi_device *spi)
return 0;
}
-static int tegra_spi_prepare_transfer(struct spi_master *spi)
-{
- struct tegra_spi_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_spi_transfer_one_message(struct spi_master *master,
struct spi_message *msg)
{
@@ -870,15 +856,6 @@ exit:
return ret;
}
-static int tegra_spi_unprepare_transfer(struct spi_master *spi)
-{
- struct tegra_spi_data *tspi = spi_master_get_devdata(spi);
-
- pm_runtime_put(tspi->dev);
-
- return 0;
-}
-
static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi)
{
struct spi_transfer *t = tspi->curr_xfer;
@@ -1064,11 +1041,10 @@ static int tegra_spi_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_spi_setup;
- master->prepare_transfer_hardware = tegra_spi_prepare_transfer;
master->transfer_one_message = tegra_spi_transfer_one_message;
- master->unprepare_transfer_hardware = tegra_spi_unprepare_transfer;
master->num_chipselect = MAX_CHIP_SELECT;
master->bus_num = -1;
+ master->auto_runtime_pm = true;
tspi->master = master;
tspi->dev = &pdev->dev;