diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-06-14 12:19:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-14 14:46:58 +0100 |
| commit | 4983d32526ab6db2f8bd2288def8abf2da5f37b2 (patch) | |
| tree | b8f91b64696c4ddd4ec98e513cef80e8b9fc592c /sound/soc/codecs | |
| parent | b50455fab459b0ba17f6129203f77c6acce946ce (diff) | |
| download | op-kernel-dev-4983d32526ab6db2f8bd2288def8abf2da5f37b2.zip op-kernel-dev-4983d32526ab6db2f8bd2288def8abf2da5f37b2.tar.gz | |
ASoC: nau8825: mark pm functions __maybe_unused
The newly added nau8825_dai_is_active() function is only called from
the PM logic that is build-time conditional in this driver, so we get
a warning when CONFIG_PM is disabled:
sound/soc/codecs/nau8825.c:229:13: error: 'nau8825_dai_is_active' defined but not used [-Werror=unused-function]
static bool nau8825_dai_is_active(struct nau8825 *nau8825)
By replacing the #ifdef around the functions with a __maybe_unused
annotation, the code becomes more robust to this kind of problem
and we no longer get the warning while also slightly improving
readability.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b50455fab459 ("ASoC: nau8825: cross talk suppression measurement function")
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/nau8825.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 4b0a1b8..3f30e6e 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -2216,8 +2216,7 @@ static int nau8825_set_bias_level(struct snd_soc_codec *codec, return 0; } -#ifdef CONFIG_PM -static int nau8825_suspend(struct snd_soc_codec *codec) +static int __maybe_unused nau8825_suspend(struct snd_soc_codec *codec) { struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); @@ -2229,7 +2228,7 @@ static int nau8825_suspend(struct snd_soc_codec *codec) return 0; } -static int nau8825_resume(struct snd_soc_codec *codec) +static int __maybe_unused nau8825_resume(struct snd_soc_codec *codec) { struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); @@ -2253,10 +2252,6 @@ static int nau8825_resume(struct snd_soc_codec *codec) return 0; } -#else -#define nau8825_suspend NULL -#define nau8825_resume NULL -#endif static struct snd_soc_codec_driver nau8825_codec_driver = { .probe = nau8825_codec_probe, |
