Commit 8e8f2ac0 authored by Mark Brown's avatar Mark Brown

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
...@@ -204,6 +204,9 @@ struct tegra_slink_data { ...@@ -204,6 +204,9 @@ struct tegra_slink_data {
struct dma_async_tx_descriptor *tx_dma_desc; 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, static inline u32 tegra_slink_readl(struct tegra_slink_data *tspi,
unsigned long reg) unsigned long reg)
{ {
...@@ -1182,7 +1185,6 @@ static int tegra_slink_resume(struct device *dev) ...@@ -1182,7 +1185,6 @@ static int tegra_slink_resume(struct device *dev)
} }
#endif #endif
#ifdef CONFIG_PM
static int tegra_slink_runtime_suspend(struct device *dev) static int tegra_slink_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
...@@ -1208,7 +1210,6 @@ static int tegra_slink_runtime_resume(struct device *dev) ...@@ -1208,7 +1210,6 @@ static int tegra_slink_runtime_resume(struct device *dev)
} }
return 0; return 0;
} }
#endif /* CONFIG_PM */
static const struct dev_pm_ops slink_pm_ops = { static const struct dev_pm_ops slink_pm_ops = {
SET_RUNTIME_PM_OPS(tegra_slink_runtime_suspend, SET_RUNTIME_PM_OPS(tegra_slink_runtime_suspend,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment