Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 612aa5ce authored by Mark Brown's avatar Mark Brown
Browse files

spi/tegra114: Use core runtime PM 



Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
parent fc0f81b7

drivers/spi/spi-tegra114.c

+1 −25
Original line number Original line Diff line number Diff line
@@ -803,20 +803,6 @@ static int tegra_spi_setup(struct spi_device *spi) 
	return 0;

	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,

static int tegra_spi_transfer_one_message(struct spi_master *master,

			struct spi_message *msg)

			struct spi_message *msg)

{

{
@@ -870,15 +856,6 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, 
	return ret;

	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)

static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi)

{

{

	struct spi_transfer *t = tspi->curr_xfer;

	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: */

	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;

	master->setup = tegra_spi_setup;

	master->setup = tegra_spi_setup;

	master->prepare_transfer_hardware = tegra_spi_prepare_transfer;

	master->transfer_one_message = tegra_spi_transfer_one_message;

	master->transfer_one_message = tegra_spi_transfer_one_message;

	master->unprepare_transfer_hardware = tegra_spi_unprepare_transfer;

	master->num_chipselect = MAX_CHIP_SELECT;

	master->num_chipselect = MAX_CHIP_SELECT;

	master->bus_num = -1;

	master->bus_num = -1;

	master->auto_runtime_pm = true;





	tspi->master = master;

	tspi->master = master;

	tspi->dev = &pdev->dev;

	tspi->dev = &pdev->dev;