Commit 58ff5f4db1ae07bae553f07f7ba049db2dcf10ae
Merge series "ASoC: tegra: Fix compile warning with CONFIG_PM=n" from Takashi Iwai <tiwai@suse.de>:
Hi, this is a trivial patch set to add the missing __maybe_unused for covering the compile warnings with CONFIG_PM=n. Takashi === Takashi Iwai (5): ASoC: tegra: tegra186_dspk: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_admaif: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_ahub: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_dmic: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_i2s: Fix compile warning with CONFIG_PM=n sound/soc/tegra/tegra186_dspk.c | 4 ++-- sound/soc/tegra/tegra210_admaif.c | 4 ++-- sound/soc/tegra/tegra210_ahub.c | 4 ++-- sound/soc/tegra/tegra210_dmic.c | 4 ++-- sound/soc/tegra/tegra210_i2s.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) -- 2.16.4
Showing 5 changed files Side-by-side Diff
sound/soc/tegra/tegra186_dspk.c
| ... | ... | @@ -71,7 +71,7 @@ |
| 71 | 71 | return 0; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | -static int tegra186_dspk_runtime_suspend(struct device *dev) | |
| 74 | +static int __maybe_unused tegra186_dspk_runtime_suspend(struct device *dev) | |
| 75 | 75 | { |
| 76 | 76 | struct tegra186_dspk *dspk = dev_get_drvdata(dev); |
| 77 | 77 | |
| ... | ... | @@ -83,7 +83,7 @@ |
| 83 | 83 | return 0; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | -static int tegra186_dspk_runtime_resume(struct device *dev) | |
| 86 | +static int __maybe_unused tegra186_dspk_runtime_resume(struct device *dev) | |
| 87 | 87 | { |
| 88 | 88 | struct tegra186_dspk *dspk = dev_get_drvdata(dev); |
| 89 | 89 | int err; |
sound/soc/tegra/tegra210_admaif.c
| ... | ... | @@ -219,7 +219,7 @@ |
| 219 | 219 | .cache_type = REGCACHE_FLAT, |
| 220 | 220 | }; |
| 221 | 221 | |
| 222 | -static int tegra_admaif_runtime_suspend(struct device *dev) | |
| 222 | +static int __maybe_unused tegra_admaif_runtime_suspend(struct device *dev) | |
| 223 | 223 | { |
| 224 | 224 | struct tegra_admaif *admaif = dev_get_drvdata(dev); |
| 225 | 225 | |
| ... | ... | @@ -229,7 +229,7 @@ |
| 229 | 229 | return 0; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | -static int tegra_admaif_runtime_resume(struct device *dev) | |
| 232 | +static int __maybe_unused tegra_admaif_runtime_resume(struct device *dev) | |
| 233 | 233 | { |
| 234 | 234 | struct tegra_admaif *admaif = dev_get_drvdata(dev); |
| 235 | 235 |
sound/soc/tegra/tegra210_ahub.c
| ... | ... | @@ -564,7 +564,7 @@ |
| 564 | 564 | }; |
| 565 | 565 | MODULE_DEVICE_TABLE(of, tegra_ahub_of_match); |
| 566 | 566 | |
| 567 | -static int tegra_ahub_runtime_suspend(struct device *dev) | |
| 567 | +static int __maybe_unused tegra_ahub_runtime_suspend(struct device *dev) | |
| 568 | 568 | { |
| 569 | 569 | struct tegra_ahub *ahub = dev_get_drvdata(dev); |
| 570 | 570 | |
| ... | ... | @@ -576,7 +576,7 @@ |
| 576 | 576 | return 0; |
| 577 | 577 | } |
| 578 | 578 | |
| 579 | -static int tegra_ahub_runtime_resume(struct device *dev) | |
| 579 | +static int __maybe_unused tegra_ahub_runtime_resume(struct device *dev) | |
| 580 | 580 | { |
| 581 | 581 | struct tegra_ahub *ahub = dev_get_drvdata(dev); |
| 582 | 582 | int err; |
sound/soc/tegra/tegra210_dmic.c
| ... | ... | @@ -40,7 +40,7 @@ |
| 40 | 40 | { TEGRA210_DMIC_LP_BIQUAD_1_COEF_4, 0x0 }, |
| 41 | 41 | }; |
| 42 | 42 | |
| 43 | -static int tegra210_dmic_runtime_suspend(struct device *dev) | |
| 43 | +static int __maybe_unused tegra210_dmic_runtime_suspend(struct device *dev) | |
| 44 | 44 | { |
| 45 | 45 | struct tegra210_dmic *dmic = dev_get_drvdata(dev); |
| 46 | 46 | |
| ... | ... | @@ -52,7 +52,7 @@ |
| 52 | 52 | return 0; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | -static int tegra210_dmic_runtime_resume(struct device *dev) | |
| 55 | +static int __maybe_unused tegra210_dmic_runtime_resume(struct device *dev) | |
| 56 | 56 | { |
| 57 | 57 | struct tegra210_dmic *dmic = dev_get_drvdata(dev); |
| 58 | 58 | int err; |
sound/soc/tegra/tegra210_i2s.c
| ... | ... | @@ -164,7 +164,7 @@ |
| 164 | 164 | return tegra210_i2s_sw_reset(compnt, is_playback); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | -static int tegra210_i2s_runtime_suspend(struct device *dev) | |
| 167 | +static int __maybe_unused tegra210_i2s_runtime_suspend(struct device *dev) | |
| 168 | 168 | { |
| 169 | 169 | struct tegra210_i2s *i2s = dev_get_drvdata(dev); |
| 170 | 170 | |
| ... | ... | @@ -176,7 +176,7 @@ |
| 176 | 176 | return 0; |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | -static int tegra210_i2s_runtime_resume(struct device *dev) | |
| 179 | +static int __maybe_unused tegra210_i2s_runtime_resume(struct device *dev) | |
| 180 | 180 | { |
| 181 | 181 | struct tegra210_i2s *i2s = dev_get_drvdata(dev); |
| 182 | 182 | int err; |