ASoC: sunxi: sun8i-codec-analog: 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/875xbhtnft.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c
index 445b341418964d96f6afac539dc18ea67425e570..2024e2b2553ed2f2b515c8f396e986cbb9ef0439 100644 (file)
--- a/sound/soc/sunxi/sun8i-codec-analog.c
+++ b/sound/soc/sunxi/sun8i-codec-analog.c
@@ -390,7 +390,7 @@ static const struct snd_soc_dapm_route sun8i_codec_headphone_routes[] = {
 
 static int sun8i_codec_add_headphone(struct snd_soc_component *cmpnt)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cmpnt);
        struct device *dev = cmpnt->dev;
        int ret;
 
@@ -428,7 +428,7 @@ static const struct snd_soc_dapm_widget sun8i_codec_mbias_widgets[] = {
 
 static int sun8i_codec_add_mbias(struct snd_soc_component *cmpnt)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cmpnt);
        struct device *dev = cmpnt->dev;
        int ret;
 
@@ -449,7 +449,7 @@ static const struct snd_soc_dapm_widget sun8i_codec_hmic_widgets[] = {
 
 static int sun8i_codec_add_hmic(struct snd_soc_component *cmpnt)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cmpnt);
        struct device *dev = cmpnt->dev;
        int ret;
 
@@ -486,7 +486,7 @@ static const struct snd_soc_dapm_route sun8i_codec_linein_routes[] = {
 
 static int sun8i_codec_add_linein(struct snd_soc_component *cmpnt)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cmpnt);
        struct device *dev = cmpnt->dev;
        int ret;
 
@@ -567,7 +567,7 @@ static const struct snd_soc_dapm_route sun8i_codec_lineout_routes[] = {
 
 static int sun8i_codec_add_lineout(struct snd_soc_component *cmpnt)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cmpnt);
        struct device *dev = cmpnt->dev;
        int ret;
 
@@ -632,7 +632,7 @@ static const struct snd_soc_dapm_route sun8i_codec_mic2_routes[] = {
 
 static int sun8i_codec_add_mic2(struct snd_soc_component *cmpnt)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cmpnt);
        struct device *dev = cmpnt->dev;
        int ret;
 
@@ -688,7 +688,7 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {
 static int sun8i_codec_analog_add_mixer(struct snd_soc_component *cmpnt,
                                        const struct sun8i_codec_analog_quirks *quirks)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cmpnt);
        struct device *dev = cmpnt->dev;
        int ret;