From 8e8f2ac09db909e7cb8ae1fef9c1e524c49a1b48 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 20 Sep 2021 16:21:19 +0100 Subject: [PATCH] ASoC: Drop mistakenly applied SPI patch Revert 6e8cc4ddce828 ("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: Mark Brown --- drivers/spi/spi-tegra20-slink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 8ce840c..ebd27f8 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c @@ -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, -- 2.7.4