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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
46f360c5 697f92e6

+15 -11
+15 -11
sound/soc/codecs/wcd9335.c
··· 1260 1260 static int slim_rx_mux_get(struct snd_kcontrol *kc, 1261 1261 struct snd_ctl_elem_value *ucontrol) 1262 1262 { 1263 - struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_widget(kc); 1264 - struct wcd9335_codec *wcd = dev_get_drvdata(w->dapm->dev); 1263 + struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_to_widget(kc); 1264 + struct device *dev = snd_soc_dapm_to_dev(w->dapm); 1265 + struct wcd9335_codec *wcd = dev_get_drvdata(dev); 1265 1266 u32 port_id = w->shift; 1266 1267 1267 1268 ucontrol->value.enumerated.item[0] = wcd->rx_port_value[port_id]; ··· 1273 1272 static int slim_rx_mux_put(struct snd_kcontrol *kc, 1274 1273 struct snd_ctl_elem_value *ucontrol) 1275 1274 { 1276 - struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_widget(kc); 1277 - struct wcd9335_codec *wcd = dev_get_drvdata(w->dapm->dev); 1275 + struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_to_widget(kc); 1276 + struct device *dev = snd_soc_dapm_to_dev(w->dapm); 1277 + struct wcd9335_codec *wcd = dev_get_drvdata(dev); 1278 1278 struct soc_enum *e = (struct soc_enum *)kc->private_value; 1279 1279 struct snd_soc_dapm_update *update = NULL; 1280 1280 u32 port_id = w->shift; ··· 1325 1323 struct snd_ctl_elem_value *ucontrol) 1326 1324 { 1327 1325 1328 - struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kc); 1329 - struct wcd9335_codec *wcd = dev_get_drvdata(dapm->dev); 1330 - struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kc); 1326 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kc); 1327 + struct device *dev = snd_soc_dapm_to_dev(dapm); 1328 + struct wcd9335_codec *wcd = dev_get_drvdata(dev); 1329 + struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kc); 1331 1330 struct soc_mixer_control *mixer = 1332 1331 (struct soc_mixer_control *)kc->private_value; 1333 1332 int dai_id = widget->shift; ··· 1343 1340 struct snd_ctl_elem_value *ucontrol) 1344 1341 { 1345 1342 1346 - struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kc); 1347 - struct wcd9335_codec *wcd = dev_get_drvdata(widget->dapm->dev); 1343 + struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kc); 1344 + struct device *dev = snd_soc_dapm_to_dev(widget->dapm); 1345 + struct wcd9335_codec *wcd = dev_get_drvdata(dev); 1348 1346 struct snd_soc_dapm_update *update = NULL; 1349 1347 struct soc_mixer_control *mixer = 1350 1348 (struct soc_mixer_control *)kc->private_value; ··· 1478 1474 static int wcd9335_put_dec_enum(struct snd_kcontrol *kc, 1479 1475 struct snd_ctl_elem_value *ucontrol) 1480 1476 { 1481 - struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kc); 1477 + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kc); 1482 1478 struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 1483 1479 struct soc_enum *e = (struct soc_enum *)kc->private_value; 1484 1480 unsigned int val, reg, sel; ··· 1533 1529 struct snd_soc_component *component; 1534 1530 int reg, val; 1535 1531 1536 - component = snd_soc_dapm_kcontrol_component(kc); 1532 + component = snd_soc_dapm_kcontrol_to_component(kc); 1537 1533 val = ucontrol->value.enumerated.item[0]; 1538 1534 1539 1535 if (e->reg == WCD9335_CDC_RX0_RX_PATH_SEC0)