ASoC: wm8974: Convert to snd_soc_cache_sync (0bad3d84) · Commits · 戴 / test

sound/soc/codecs/wm8974.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -530,6 +530,8 @@ static int wm8974_set_bias_level(struct snd_soc_codec *codec,
		power1 \|= WM8974_POWER1_BIASEN \| WM8974_POWER1_BUFIOEN;

		if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
		snd_soc_cache_sync(codec);

		/* Initial cap charge at VMID 5k */
		snd_soc_write(codec, WM8974_POWER1, power1 \| 0x3);
		mdelay(100);
		@@ -589,18 +591,7 @@ static int wm8974_suspend(struct snd_soc_codec *codec, pm_message_t state)

		static int wm8974_resume(struct snd_soc_codec *codec)
		{
		int i;
		u8 data[2];
		u16 *cache = codec->reg_cache;

		/* Sync reg_cache with the hardware */
		for (i = 0; i < ARRAY_SIZE(wm8974_reg); i++) {
		data[0] = (i << 1) \| ((cache[i] >> 8) & 0x0001);
		data[1] = cache[i] & 0x00ff;
		codec->hw_write(codec->control_data, data, 2);
		}
		wm8974_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

		return 0;
		}