diff options
| author | Barry Song <barry.song@analog.com> | 2011-06-15 21:29:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-16 12:42:10 +0200 |
| commit | 5d0e7f61702ea562ee8bdea56b475978c4ff08ac (patch) | |
| tree | 401fc05422854e7d2072b0d2f79987ba3ee1941e /sound/soc/codecs/ad1836.c | |
| parent | ASoC: AD1836: fix codec name (diff) | |
| download | linux-5d0e7f61702ea562ee8bdea56b475978c4ff08ac.tar.xz linux-5d0e7f61702ea562ee8bdea56b475978c4ff08ac.zip | |
ASoC: AD1836: rename suspend/resume funcs
Use less specific names for suspend/resume to match the probe/remove funcs
where these are now used.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ad1836.c')
| -rw-r--r-- | sound/soc/codecs/ad1836.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index 9cc6123cf7ea..4e5c5726366b 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c @@ -189,26 +189,6 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream, return 0; } -#ifdef CONFIG_PM -static int ad1836_soc_suspend(struct snd_soc_codec *codec, - pm_message_t state) -{ - /* reset clock control mode */ - return snd_soc_update_bits(codec, AD1836_ADC_CTRL2, - AD1836_ADC_SERFMT_MASK, 0); -} - -static int ad1836_soc_resume(struct snd_soc_codec *codec) -{ - /* restore clock control mode */ - return snd_soc_update_bits(codec, AD1836_ADC_CTRL2, - AD1836_ADC_SERFMT_MASK, AD1836_ADC_AUX); -} -#else -#define ad1836_soc_suspend NULL -#define ad1836_soc_resume NULL -#endif - static struct snd_soc_dai_ops ad1836_dai_ops = { .hw_params = ad1836_hw_params, .set_fmt = ad1836_set_dai_fmt, @@ -242,6 +222,25 @@ static struct snd_soc_dai_driver ad183x_dais[] = { [AD1838] = AD183X_DAI("ad1838", 3, 1), }; +#ifdef CONFIG_PM +static int ad1836_suspend(struct snd_soc_codec *codec, pm_message_t state) +{ + /* reset clock control mode */ + return snd_soc_update_bits(codec, AD1836_ADC_CTRL2, + AD1836_ADC_SERFMT_MASK, 0); +} + +static int ad1836_resume(struct snd_soc_codec *codec) +{ + /* restore clock control mode */ + return snd_soc_update_bits(codec, AD1836_ADC_CTRL2, + AD1836_ADC_SERFMT_MASK, AD1836_ADC_AUX); +} +#else +#define ad1836_suspend NULL +#define ad1836_resume NULL +#endif + static int ad1836_probe(struct snd_soc_codec *codec) { struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec); @@ -324,8 +323,8 @@ static int ad1836_remove(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_ad1836 = { .probe = ad1836_probe, .remove = ad1836_remove, - .suspend = ad1836_soc_suspend, - .resume = ad1836_soc_resume, + .suspend = ad1836_suspend, + .resume = ad1836_resume, .reg_cache_size = AD1836_NUM_REGS, .reg_word_size = sizeof(u16), |