Unverified Commit 8e8f2ac0 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Drop mistakenly applied SPI patch 



Revert 6e8cc4dd ("spi: tegra20-slink: Declare runtime suspend and
resume functions conditionally") which was mistakenly applied to the
ASoC tree not the SPI tree (where it was also applied.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cca46db7

drivers/spi/spi-tegra20-slink.c

+3 −2
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ struct tegra_slink_data { 
	struct dma_async_tx_descriptor		*tx_dma_desc;

};



static int tegra_slink_runtime_suspend(struct device *dev);

static int tegra_slink_runtime_resume(struct device *dev);



static inline u32 tegra_slink_readl(struct tegra_slink_data *tspi,

		unsigned long reg)

{
@@ -1182,7 +1185,6 @@ static int tegra_slink_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM

static int tegra_slink_runtime_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);
@@ -1208,7 +1210,6 @@ static int tegra_slink_runtime_resume(struct device *dev) 
	}

	return 0;

}

#endif /* CONFIG_PM */



static const struct dev_pm_ops slink_pm_ops = {

	SET_RUNTIME_PM_OPS(tegra_slink_runtime_suspend,