ASoC: wm8960: Convert to snd_soc_cache_sync (bc45df2d) · Commits · 戴 / test

sound/soc/codecs/wm8960.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -574,6 +574,8 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,

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

		/* Enable anti-pop features */
		snd_soc_write(codec, WM8960_APOP1,
		WM8960_POBCTRL \| WM8960_SOFT_ST \|
		@@ -676,6 +678,9 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
		WM8960_VREF \| WM8960_VMID_MASK, 0);
		break;

		case SND_SOC_BIAS_OFF:
		snd_soc_cache_sync(codec);
		break;
		default:
		break;
		}
		@@ -901,16 +906,6 @@ static int wm8960_suspend(struct snd_soc_codec *codec, pm_message_t state)
		static int wm8960_resume(struct snd_soc_codec *codec)
		{
		struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
		int i;
		u8 data[2];
		u16 *cache = codec->reg_cache;

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

		wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
		return 0;