From: Barry Song barry.song@analog.com
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 --- sound/soc/codecs/ad183x.c | 51 ++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/sound/soc/codecs/ad183x.c b/sound/soc/codecs/ad183x.c index 2c5c49e..21567ce 100644 --- a/sound/soc/codecs/ad183x.c +++ b/sound/soc/codecs/ad183x.c @@ -155,30 +155,6 @@ static int ad183x_hw_params(struct snd_pcm_substream *substream, return 0; }
-#ifdef CONFIG_PM -static int ad183x_soc_suspend(struct snd_soc_codec *codec, - pm_message_t state) -{ - /* reset clock control mode */ - u16 adc_ctrl2 = snd_soc_read(codec, AD183X_ADC_CTRL2); - adc_ctrl2 &= ~AD183X_ADC_SERFMT_MASK; - - return snd_soc_write(codec, AD183X_ADC_CTRL2, adc_ctrl2); -} - -static int ad183x_soc_resume(struct snd_soc_codec *codec) -{ - /* restore clock control mode */ - u16 adc_ctrl2 = snd_soc_read(codec, AD183X_ADC_CTRL2); - adc_ctrl2 |= AD183X_ADC_AUX; - - return snd_soc_write(codec, AD183X_ADC_CTRL2, adc_ctrl2); -} -#else -#define ad183x_soc_suspend NULL -#define ad183x_soc_resume NULL -#endif - static struct snd_soc_dai_ops ad183x_dai_ops = { .hw_params = ad183x_hw_params, .set_fmt = ad183x_set_dai_fmt, @@ -206,6 +182,29 @@ static struct snd_soc_dai_driver ad183x_dai = { .ops = &ad183x_dai_ops, };
+#ifdef CONFIG_PM +static int ad183x_suspend(struct snd_soc_codec *codec, pm_message_t state) +{ + /* reset clock control mode */ + u16 adc_ctrl2 = snd_soc_read(codec, AD183X_ADC_CTRL2); + adc_ctrl2 &= ~AD183X_ADC_SERFMT_MASK; + + return snd_soc_write(codec, AD183X_ADC_CTRL2, adc_ctrl2); +} + +static int ad183x_resume(struct snd_soc_codec *codec) +{ + /* restore clock control mode */ + u16 adc_ctrl2 = snd_soc_read(codec, AD183X_ADC_CTRL2); + adc_ctrl2 |= AD183X_ADC_AUX; + + return snd_soc_write(codec, AD183X_ADC_CTRL2, adc_ctrl2); +} +#else +#define ad183x_suspend NULL +#define ad183x_resume NULL +#endif + static int ad183x_probe(struct snd_soc_codec *codec) { struct ad183x_priv *ad183x = snd_soc_codec_get_drvdata(codec); @@ -242,8 +241,8 @@ static int ad183x_remove(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_ad183x = { .probe = ad183x_probe, .remove = ad183x_remove, - .suspend = ad183x_soc_suspend, - .resume = ad183x_soc_resume, + .suspend = ad183x_suspend, + .resume = ad183x_resume, .reg_cache_size = AD183X_NUM_REGS, .reg_word_size = sizeof(u16), };