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

ASoC: ti: omap3pandora: 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/87pl9ps8ub.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
c6995160 42e142c8

+19 -17
+19 -17
sound/soc/ti/omap3pandora.c
··· 71 71 * VCC power on/off and /PD pin high/low 72 72 */ 73 73 if (SND_SOC_DAPM_EVENT_ON(event)) { 74 + struct device *dev = snd_soc_dapm_to_dev(w->dapm); 75 + 74 76 ret = regulator_enable(omap3pandora_dac_reg); 75 77 if (ret) { 76 - dev_err(w->dapm->dev, "Failed to power DAC: %d\n", ret); 78 + dev_err(dev, "Failed to power DAC: %d\n", ret); 77 79 return ret; 78 80 } 79 81 mdelay(1); ··· 141 139 142 140 static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd) 143 141 { 144 - struct snd_soc_dapm_context *dapm = &rtd->card->dapm; 142 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(rtd->card); 145 143 146 144 /* All TWL4030 output pins are floating */ 147 - snd_soc_dapm_nc_pin(dapm, "EARPIECE"); 148 - snd_soc_dapm_nc_pin(dapm, "PREDRIVEL"); 149 - snd_soc_dapm_nc_pin(dapm, "PREDRIVER"); 150 - snd_soc_dapm_nc_pin(dapm, "HSOL"); 151 - snd_soc_dapm_nc_pin(dapm, "HSOR"); 152 - snd_soc_dapm_nc_pin(dapm, "CARKITL"); 153 - snd_soc_dapm_nc_pin(dapm, "CARKITR"); 154 - snd_soc_dapm_nc_pin(dapm, "HFL"); 155 - snd_soc_dapm_nc_pin(dapm, "HFR"); 156 - snd_soc_dapm_nc_pin(dapm, "VIBRA"); 145 + snd_soc_dapm_disable_pin(dapm, "EARPIECE"); 146 + snd_soc_dapm_disable_pin(dapm, "PREDRIVEL"); 147 + snd_soc_dapm_disable_pin(dapm, "PREDRIVER"); 148 + snd_soc_dapm_disable_pin(dapm, "HSOL"); 149 + snd_soc_dapm_disable_pin(dapm, "HSOR"); 150 + snd_soc_dapm_disable_pin(dapm, "CARKITL"); 151 + snd_soc_dapm_disable_pin(dapm, "CARKITR"); 152 + snd_soc_dapm_disable_pin(dapm, "HFL"); 153 + snd_soc_dapm_disable_pin(dapm, "HFR"); 154 + snd_soc_dapm_disable_pin(dapm, "VIBRA"); 157 155 158 156 return 0; 159 157 } 160 158 161 159 static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd) 162 160 { 163 - struct snd_soc_dapm_context *dapm = &rtd->card->dapm; 161 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(rtd->card); 164 162 165 163 /* Not comnnected */ 166 - snd_soc_dapm_nc_pin(dapm, "HSMIC"); 167 - snd_soc_dapm_nc_pin(dapm, "CARKITMIC"); 168 - snd_soc_dapm_nc_pin(dapm, "DIGIMIC0"); 169 - snd_soc_dapm_nc_pin(dapm, "DIGIMIC1"); 164 + snd_soc_dapm_disable_pin(dapm, "HSMIC"); 165 + snd_soc_dapm_disable_pin(dapm, "CARKITMIC"); 166 + snd_soc_dapm_disable_pin(dapm, "DIGIMIC0"); 167 + snd_soc_dapm_disable_pin(dapm, "DIGIMIC1"); 170 168 171 169 return 0; 172 170 }