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

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

authored by

Kuninori Morimoto and committed by
Mark Brown
ea9d164c 4ddf34b1

+7 -7
+7 -7
sound/soc/codecs/mt6358.c
··· 1287 1287 { 1288 1288 struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm); 1289 1289 struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt); 1290 - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); 1290 + unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]); 1291 1291 int device = DEVICE_HP; 1292 1292 1293 1293 dev_info(priv->dev, "%s(), event 0x%x, dev_counter[DEV_HP] %d, mux %u\n", ··· 1349 1349 dev_info(priv->dev, "%s(), event 0x%x, mux %u\n", 1350 1350 __func__, 1351 1351 event, 1352 - dapm_kcontrol_get_value(w->kcontrols[0])); 1352 + snd_soc_dapm_kcontrol_get_value(w->kcontrols[0])); 1353 1353 1354 1354 switch (event) { 1355 1355 case SND_SOC_DAPM_PRE_PMU: ··· 1828 1828 { 1829 1829 struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm); 1830 1830 struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt); 1831 - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); 1831 + unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]); 1832 1832 1833 1833 dev_dbg(priv->dev, "%s(), event 0x%x, mux %u\n", 1834 1834 __func__, event, mux); ··· 1874 1874 { 1875 1875 struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm); 1876 1876 struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt); 1877 - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); 1877 + unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]); 1878 1878 1879 1879 dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n", 1880 1880 __func__, event, mux); ··· 1890 1890 { 1891 1891 struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm); 1892 1892 struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt); 1893 - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); 1893 + unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]); 1894 1894 1895 1895 dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n", 1896 1896 __func__, event, mux); ··· 1906 1906 { 1907 1907 struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm); 1908 1908 struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt); 1909 - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); 1909 + unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]); 1910 1910 1911 1911 dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n", 1912 1912 __func__, event, mux); ··· 1922 1922 { 1923 1923 struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm); 1924 1924 struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt); 1925 - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); 1925 + unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]); 1926 1926 1927 1927 dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n", 1928 1928 __func__, event, mux);