[alsa-devel] [PATCH] ASoC: Remove bitrotted wm8962_resume()

Liam Girdwood lrg at ti.com
Tue Sep 20 13:20:20 CEST 2011


On Mon, 2011-09-19 at 23:34 +0100, Mark Brown wrote:
> This functionality is now subsumed within the bias management, using the
> standard cache management functionality, without assuming the cache type.
> 
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/codecs/wm8962.c |   26 --------------------------
>  1 files changed, 0 insertions(+), 26 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
> index ae7a263..ac2a859 100644
> --- a/sound/soc/codecs/wm8962.c
> +++ b/sound/soc/codecs/wm8962.c
> @@ -3680,31 +3680,6 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
>  }
>  EXPORT_SYMBOL_GPL(wm8962_mic_detect);
>  
> -#ifdef CONFIG_PM
> -static int wm8962_resume(struct snd_soc_codec *codec)
> -{
> -	u16 *reg_cache = codec->reg_cache;
> -	int i;
> -
> -	/* Restore the registers */
> -	for (i = 1; i < codec->driver->reg_cache_size; i++) {
> -		switch (i) {
> -		case WM8962_SOFTWARE_RESET:
> -			continue;
> -		default:
> -			break;
> -		}
> -
> -		if (reg_cache[i] != wm8962_reg[i])
> -			snd_soc_write(codec, i, reg_cache[i]);
> -	}
> -
> -	return 0;
> -}
> -#else
> -#define wm8962_resume NULL
> -#endif
> -
>  #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
>  static int beep_rates[] = {
>  	500, 1000, 2000, 4000,
> @@ -4228,7 +4203,6 @@ static int wm8962_remove(struct snd_soc_codec *codec)
>  static struct snd_soc_codec_driver soc_codec_dev_wm8962 = {
>  	.probe =	wm8962_probe,
>  	.remove =	wm8962_remove,
> -	.resume =	wm8962_resume,
>  	.set_bias_level = wm8962_set_bias_level,
>  	.reg_cache_size = WM8962_MAX_REGISTER + 1,
>  	.reg_word_size = sizeof(u16),


Acked-by: Liam Girdwood <lrg at ti.com>



More information about the Alsa-devel mailing list