spi/tegra20-slink: Use core runtime PM
authorMark Brown <broonie@linaro.org>
Sun, 28 Jul 2013 14:37:59 +0000 (15:37 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 17:00:30 +0000 (18:00 +0100)
Signed-off-by: Mark Brown <broonie@linaro.org>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
drivers/spi/spi-tegra20-slink.c

index b2fb115df027bfa40aba3f46bc7bd13b170c5509..c70353672a23df85234c5089c28af6a155d33a99 100644 (file)
@@ -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;