Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: codecs: jz4770: convert to snd_soc_dapm_xxx()

This patch converts below functions.

dapm->dev -> snd_soc_dapm_to_dev()
dapm->card -> snd_soc_dapm_to_card()
dapm->component -> snd_soc_dapm_to_component()

dapm_kcontrol_get_value() -> snd_soc_dapm_kcontrol_get_value()

snd_soc_component_enable_pin() -> snd_soc_dapm_enable_pin()
snd_soc_component_enable_pin_unlocked() -> snd_soc_dapm_enable_pin_unlocked()
snd_soc_component_disable_pin() -> snd_soc_dapm_disable_pin()
snd_soc_component_disable_pin_unlocked() -> snd_soc_dapm_disable_pin_unlocked()
snd_soc_component_nc_pin() -> snd_soc_dapm_nc_pin()
snd_soc_component_nc_pin_unlocked() -> snd_soc_dapm_nc_pin_unlocked()
snd_soc_component_get_pin_status() -> snd_soc_dapm_get_pin_status()
snd_soc_component_force_enable_pin() -> snd_soc_dapm_force_enable_pin()
snd_soc_component_force_enable_pin_unlocked() -> snd_soc_dapm_force_enable_pin_unlocked()
snd_soc_component_force_bias_level() -> snd_soc_dapm_force_bias_level()
snd_soc_component_get_bias_level() -> snd_soc_dapm_get_bias_level()
snd_soc_component_init_bias_level() -> snd_soc_dapm_init_bias_level()
snd_soc_component_get_dapm() -> snd_soc_component_to_dapm()

snd_soc_dapm_kcontrol_component() -> snd_soc_dapm_kcontrol_to_component()
snd_soc_dapm_kcontrol_widget() -> snd_soc_dapm_kcontrol_to_widget()
snd_soc_dapm_kcontrol_dapm() -> snd_soc_dapm_kcontrol_to_dapm()
snd_soc_dapm_np_pin() -> snd_soc_dapm_disable_pin()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/87fral5sf9.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
daaf102a f7e9d040

+4 -4
+4 -4
sound/soc/codecs/jz4770.c
··· 217 217 struct snd_soc_dai *dai) 218 218 { 219 219 struct snd_soc_component *codec = dai->component; 220 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec); 220 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec); 221 221 222 222 /* 223 223 * SYSCLK output from the codec to the AIC is required to keep the ··· 234 234 struct snd_soc_dai *dai) 235 235 { 236 236 struct snd_soc_component *codec = dai->component; 237 - struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec); 237 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec); 238 238 239 239 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 240 240 snd_soc_dapm_disable_pin(dapm, "SYSCLK"); ··· 245 245 int cmd, struct snd_soc_dai *dai) 246 246 { 247 247 struct snd_soc_component *codec = dai->component; 248 + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec); 248 249 int ret = 0; 249 250 250 251 switch (cmd) { ··· 253 252 case SNDRV_PCM_TRIGGER_RESUME: 254 253 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 255 254 if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) 256 - snd_soc_component_force_bias_level(codec, 257 - SND_SOC_BIAS_ON); 255 + snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_ON); 258 256 break; 259 257 case SNDRV_PCM_TRIGGER_STOP: 260 258 case SNDRV_PCM_TRIGGER_SUSPEND: