diff options
| author | Mark Brown <broonie@kernel.org> | 2021-09-21 15:23:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-21 15:23:50 +0100 |
| commit | 66ae258ccf400e5275b8cb4ecbfe7d25f2cb2e56 (patch) | |
| tree | 386a7b596562b7dd99163e1c80255335711e7afc /drivers/spi | |
| parent | 09134c5322df9f105d9ed324051872d5d0e162aa (diff) | |
| parent | ffb1e76f4f32d2b8ea4189df0484980370476395 (diff) | |
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 8ce840c7ecc8..3226c4e1c7c0 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c @@ -1182,8 +1182,7 @@ static int tegra_slink_resume(struct device *dev) } #endif -#ifdef CONFIG_PM -static int tegra_slink_runtime_suspend(struct device *dev) +static int __maybe_unused tegra_slink_runtime_suspend(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); struct tegra_slink_data *tspi = spi_master_get_devdata(master); @@ -1195,7 +1194,7 @@ static int tegra_slink_runtime_suspend(struct device *dev) return 0; } -static int tegra_slink_runtime_resume(struct device *dev) +static int __maybe_unused tegra_slink_runtime_resume(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); struct tegra_slink_data *tspi = spi_master_get_devdata(master); @@ -1208,7 +1207,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, |