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

ASoC: codecs: cpcap: 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/874ir18loz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
cc1bb5d4 57bea9f5

+9 -12
+9 -12
sound/soc/codecs/cpcap.c
··· 380 380 static int cpcap_output_mux_get_enum(struct snd_kcontrol *kcontrol, 381 381 struct snd_ctl_elem_value *ucontrol) 382 382 { 383 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 383 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 384 384 struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component); 385 385 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 386 386 unsigned int shift = e->shift_l; ··· 423 423 static int cpcap_output_mux_put_enum(struct snd_kcontrol *kcontrol, 424 424 struct snd_ctl_elem_value *ucontrol) 425 425 { 426 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 426 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 427 427 struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component); 428 - struct snd_soc_dapm_context *dapm = 429 - snd_soc_dapm_kcontrol_dapm(kcontrol); 428 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 430 429 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 431 430 unsigned int muxval = ucontrol->value.enumerated.item[0]; 432 431 unsigned int mask = BIT(e->shift_l); ··· 467 468 static int cpcap_input_right_mux_get_enum(struct snd_kcontrol *kcontrol, 468 469 struct snd_ctl_elem_value *ucontrol) 469 470 { 470 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 471 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 471 472 struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component); 472 473 int regval, mask; 473 474 int err; ··· 506 507 static int cpcap_input_right_mux_put_enum(struct snd_kcontrol *kcontrol, 507 508 struct snd_ctl_elem_value *ucontrol) 508 509 { 509 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 510 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 510 511 struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component); 511 - struct snd_soc_dapm_context *dapm = 512 - snd_soc_dapm_kcontrol_dapm(kcontrol); 512 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 513 513 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 514 514 unsigned int muxval = ucontrol->value.enumerated.item[0]; 515 515 int regval = 0, mask; ··· 550 552 static int cpcap_input_left_mux_get_enum(struct snd_kcontrol *kcontrol, 551 553 struct snd_ctl_elem_value *ucontrol) 552 554 { 553 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 555 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 554 556 struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component); 555 557 int regval, mask; 556 558 int err; ··· 581 583 static int cpcap_input_left_mux_put_enum(struct snd_kcontrol *kcontrol, 582 584 struct snd_ctl_elem_value *ucontrol) 583 585 { 584 - struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol); 586 + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); 585 587 struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component); 586 - struct snd_soc_dapm_context *dapm = 587 - snd_soc_dapm_kcontrol_dapm(kcontrol); 588 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); 588 589 struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; 589 590 unsigned int muxval = ucontrol->value.enumerated.item[0]; 590 591 int regval = 0, mask;