diff options
| author | Mark Brown | 2021-09-20 16:21:19 +0100 |
|---|---|---|
| committer | Mark Brown | 2021-09-20 16:21:19 +0100 |
| commit | 8e8f2ac09db909e7cb8ae1fef9c1e524c49a1b48 (patch) | |
| tree | f5a25af72b1e3803eeb5393650fea8d413dd07e6 /drivers | |
| parent | cca46db7e2da12b823ee137d46824e0d6f936877 (diff) | |
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 <broonie@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 8ce840c7ecc8..ebd27f883033 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, |