ASoC: 88pm860x: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
Subsystems (4)
PATCH 1/5 ASoC: 88pm860x: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
The codec field of the snd_soc_widget struct is eventually going to be removed, use snd_soc_dapm_to_codec(w->dapm) instead.
--- sound/soc/codecs/88pm860x-codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/88pm860x-codec.c +2 -2
@@ -386,7 +386,7 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol,static int pm860x_rsync_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -struct snd_soc_codec *codec = w->codec; +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);/* * In order to avoid current on the load, mute power-on and power-off
@@ -403,7 +403,7 @@ static int pm860x_rsync_event(struct snd_soc_dapm_widget *w,static int pm860x_dac_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -struct snd_soc_codec *codec = w->codec; +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);unsigned int dac =0 ;int data;
Signature · 1 line
1.8.0
PATCH 2/5 ASoC: ak4671: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
The codec field of the snd_soc_widget struct is eventually going to be removed, use snd_soc_dapm_to_codec(w->dapm) instead.
--- sound/soc/codecs/ak4671.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/ak4671.c +1 -1
@@ -163,7 +163,7 @@ static const struct snd_kcontrol_new ak4671_snd_controls[] = {static int ak4671_out2_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -struct snd_soc_codec *codec = w->codec; +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);switch (event) {case SND_SOC_DAPM_POST_PMU :
Signature · 1 line
1.8.0
PATCH 3/5 ASoC: da732x: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
In reply to Lars-Peter ClausenThe codec field of the snd_soc_widget struct is eventually going to be removed, use snd_soc_dapm_to_codec(w->dapm) instead.
--- sound/soc/codecs/da732x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/da732x.c +2 -2
@@ -609,7 +609,7 @@ static const struct snd_kcontrol_new da732x_snd_controls[] = {static int da732x_adc_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -struct snd_soc_codec *codec = w->codec; +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);switch (event) {case SND_SOC_DAPM_POST_PMU :
@@ -663,7 +663,7 @@ static int da732x_adc_event(struct snd_soc_dapm_widget *w,static int da732x_out_pga_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -struct snd_soc_codec *codec = w->codec; +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);switch (event) {case SND_SOC_DAPM_POST_PMU :
Signature · 1 line
1.8.0
Re: [PATCH 3/5] ASoC: da732x: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
Quoted 4 lines · Lars-Peter Clausen
The codec field of the
snd_soc_widgetstruct is eventually going to be removed, usesnd_soc_dapm_to_codec(w->dapm)instead.Signed-off-by Lars-Peter Clausen <[email protected]>
PATCH 4/5 ASoC: sgtl5000: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
In reply to Lars-Peter ClausenThe codec field of the snd_soc_widget struct is eventually going to be removed, use snd_soc_dapm_to_codec(w->dapm) instead.
--- sound/soc/codecs/sgtl5000.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/codecs/sgtl5000.c +8 -6
@@ -155,18 +155,19 @@ struct sgtl5000_priv {static int mic_bias_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -struct sgtl5000_priv *sgtl5000 =snd_soc_codec_get_drvdata (w->codec); +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); +struct sgtl5000_priv *sgtl5000 =snd_soc_codec_get_drvdata (codec);switch (event) {case SND_SOC_DAPM_POST_PMU :/* change mic bias resistor */ -snd_soc_update_bits (w->codec,SGTL5000_CHIP_MIC_CTRL , +snd_soc_update_bits (codec,SGTL5000_CHIP_MIC_CTRL ,SGTL5000_BIAS_R_MASK , sgtl5000->micbias_resistor <<SGTL5000_BIAS_R_SHIFT );break ;case SND_SOC_DAPM_PRE_PMD : -snd_soc_update_bits (w->codec,SGTL5000_CHIP_MIC_CTRL , +snd_soc_update_bits (codec,SGTL5000_CHIP_MIC_CTRL ,SGTL5000_BIAS_R_MASK ,0 );break ; }
@@ -181,11 +182,12 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w,static int power_vag_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);const u32 mask =SGTL5000_DAC_POWERUP |SGTL5000_ADC_POWERUP ;switch (event) {case SND_SOC_DAPM_POST_PMU : -snd_soc_update_bits (w->codec,SGTL5000_CHIP_ANA_POWER , +snd_soc_update_bits (codec,SGTL5000_CHIP_ANA_POWER ,SGTL5000_VAG_POWERUP ,SGTL5000_VAG_POWERUP );break ;
@@ -195,9 +197,9 @@ static int power_vag_event(struct snd_soc_dapm_widget *w,* operational to prevent inadvertently starving the * other one of them. */ -if ((snd_soc_read (w->codec,SGTL5000_CHIP_ANA_POWER ) & +if ((snd_soc_read (codec,SGTL5000_CHIP_ANA_POWER ) & mask) != mask) { -snd_soc_update_bits (w->codec,SGTL5000_CHIP_ANA_POWER , +snd_soc_update_bits (codec,SGTL5000_CHIP_ANA_POWER ,SGTL5000_VAG_POWERUP ,0 );msleep (400 ); }
Signature · 1 line
1.8.0
PATCH 5/5 ASoC: sn95031: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
In reply to Lars-Peter ClausenThe codec field of the snd_soc_widget struct is eventually going to be removed, use snd_soc_dapm_to_codec(w->dapm) instead.
--- sound/soc/codecs/sn95031.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
sound/soc/codecs/sn95031.c +20 -13
@@ -233,16 +233,18 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,static int sn95031_vhs_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); +if (SND_SOC_DAPM_EVENT_ON (event)) {pr_debug ("VHS SND_SOC_DAPM_EVENT_ON doing rail startup now\n" );/* power up the rail */ -snd_soc_write (w->codec,SN95031_VHSP ,0x3D ); -snd_soc_write (w->codec,SN95031_VHSN ,0x3F ); +snd_soc_write (codec,SN95031_VHSP ,0x3D ); +snd_soc_write (codec,SN95031_VHSN ,0x3F );msleep (1 ); }else if (SND_SOC_DAPM_EVENT_OFF (event)) {pr_debug ("VHS SND_SOC_DAPM_EVENT_OFF doing rail shutdown\n" ); -snd_soc_write (w->codec,SN95031_VHSP ,0xC4 ); -snd_soc_write (w->codec,SN95031_VHSN ,0x04 ); +snd_soc_write (codec,SN95031_VHSP ,0xC4 ); +snd_soc_write (codec,SN95031_VHSN ,0x04 ); }return 0 ; }
@@ -250,14 +252,16 @@ static int sn95031_vhs_event(struct snd_soc_dapm_widget *w,static int sn95031_vihf_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); +if (SND_SOC_DAPM_EVENT_ON (event)) {pr_debug ("VIHF SND_SOC_DAPM_EVENT_ON doing rail startup now\n" );/* power up the rail */ -snd_soc_write (w->codec,SN95031_VIHF ,0x27 ); +snd_soc_write (codec,SN95031_VIHF ,0x27 );msleep (1 ); }else if (SND_SOC_DAPM_EVENT_OFF (event)) {pr_debug ("VIHF SND_SOC_DAPM_EVENT_OFF doing rail shutdown\n" ); -snd_soc_write (w->codec,SN95031_VIHF ,0x24 ); +snd_soc_write (codec,SN95031_VIHF ,0x24 ); }return 0 ; }
@@ -265,6 +269,7 @@ static int sn95031_vihf_event(struct snd_soc_dapm_widget *w,static int sn95031_dmic12_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) { +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);unsigned int ldo =0 , clk_dir =0 , data_dir =0 ;if (SND_SOC_DAPM_EVENT_ON (event)) {
@@ -273,15 +278,16 @@ static int sn95031_dmic12_event(struct snd_soc_dapm_widget *w, data_dir =BIT (7 ); }/* program DMIC LDO, clock and set clock */ -snd_soc_update_bits (w->codec,SN95031_MICBIAS ,BIT (5 )|BIT (4 ), ldo); -snd_soc_update_bits (w->codec,SN95031_DMICBUF0123 ,BIT (0 ), clk_dir); -snd_soc_update_bits (w->codec,SN95031_DMICBUF0123 ,BIT (7 ), data_dir); +snd_soc_update_bits (codec,SN95031_MICBIAS ,BIT (5 )|BIT (4 ), ldo); +snd_soc_update_bits (codec,SN95031_DMICBUF0123 ,BIT (0 ), clk_dir); +snd_soc_update_bits (codec,SN95031_DMICBUF0123 ,BIT (7 ), data_dir);return 0 ; }static int sn95031_dmic34_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) { +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);unsigned int ldo =0 , clk_dir =0 , data_dir =0 ;if (SND_SOC_DAPM_EVENT_ON (event)) {
@@ -290,22 +296,23 @@ static int sn95031_dmic34_event(struct snd_soc_dapm_widget *w, data_dir =BIT (1 ); }/* program DMIC LDO, clock and set clock */ -snd_soc_update_bits (w->codec,SN95031_MICBIAS ,BIT (5 )|BIT (4 ), ldo); -snd_soc_update_bits (w->codec,SN95031_DMICBUF0123 ,BIT (2 ), clk_dir); -snd_soc_update_bits (w->codec,SN95031_DMICBUF45 ,BIT (1 ), data_dir); +snd_soc_update_bits (codec,SN95031_MICBIAS ,BIT (5 )|BIT (4 ), ldo); +snd_soc_update_bits (codec,SN95031_DMICBUF0123 ,BIT (2 ), clk_dir); +snd_soc_update_bits (codec,SN95031_DMICBUF45 ,BIT (1 ), data_dir);return 0 ; }static int sn95031_dmic56_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) { +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);unsigned int ldo =0 ;if (SND_SOC_DAPM_EVENT_ON (event)) ldo =BIT (7 )|BIT (6 );/* program DMIC LDO */ -snd_soc_update_bits (w->codec,SN95031_MICBIAS ,BIT (7 )|BIT (6 ), ldo); +snd_soc_update_bits (codec,SN95031_MICBIAS ,BIT (7 )|BIT (6 ), ldo);return 0 ; }
Signature · 1 line
1.8.0
Re: [PATCH 5/5] ASoC: sn95031: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
Quoted 3 lines · Lars-Peter Clausen
The codec field of the
snd_soc_widgetstruct is eventually going to be removed, usesnd_soc_dapm_to_codec(w->dapm)instead.
Signature · 1 line
~Vinod
Quoted 2 lines · Lars-Peter Clausen
The codec field of the
snd_soc_widgetstruct is eventually going to be removed, usesnd_soc_dapm_to_codec(w->dapm)instead.
Applied all, thanks.