ASoC: rt5645: Replace direct snd_soc_codec dapm field access
Subsystems (5)
PATCH 1/6 ASoC: rt5645: Replace direct snd_soc_codec dapm field access
The dapm field of the snd_soc_codec struct is eventually going to be removed, in preparation for this replace all manual access to codec->dapm.bias_level with snd_soc_codec_get_bias_level() and replace all other manual access to codec->dapm with snd_soc_codec_get_dapm().
--- sound/soc/codecs/rt5645.c | 73 +++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 41 deletions(-)
sound/soc/codecs/rt5645.c +32 -41
@@ -2642,7 +2642,7 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,switch (level) {case SND_SOC_BIAS_PREPARE : -if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) { +if (SND_SOC_BIAS_STANDBY ==snd_soc_codec_get_bias_level (codec)) { snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_BG | RT5645_PWR_VREF2,
@@ -2760,20 +2760,17 @@ static int rt5650_calibration(struct rt5645_priv *rt5645)static void rt5645_enable_push_button_irq (struct snd_soc_codec *codec,bool enable) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);struct rt5645_priv *rt5645 =snd_soc_codec_get_drvdata (codec);if (enable) { -snd_soc_dapm_mutex_lock (&codec->dapm); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"ADC L power" ); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"ADC R power" ); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"LDO2" ); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync_unlocked (&codec->dapm); -snd_soc_dapm_mutex_unlock (&codec->dapm); +snd_soc_dapm_mutex_lock (dapm); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"ADC L power" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"ADC R power" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"LDO2" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"Mic Det Power" ); +snd_soc_dapm_sync_unlocked (dapm); +snd_soc_dapm_mutex_unlock (dapm);snd_soc_update_bits (codec,RT5645_INT_IRQ_ST ,0x8 ,0x8 );
@@ -2786,23 +2783,20 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,snd_soc_update_bits (codec,RT5650_4BTN_IL_CMD2 ,0x8000 ,0x0 );snd_soc_update_bits (codec,RT5645_INT_IRQ_ST ,0x8 ,0x0 ); -snd_soc_dapm_mutex_lock (&codec->dapm); -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"ADC L power" ); -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"ADC R power" ); +snd_soc_dapm_mutex_lock (dapm); +snd_soc_dapm_disable_pin_unlocked (dapm,"ADC L power" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"ADC R power" );if (rt5645->pdata.jd_mode ==0 ) -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"LDO2" ); -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync_unlocked (&codec->dapm); -snd_soc_dapm_mutex_unlock (&codec->dapm); +snd_soc_dapm_disable_pin_unlocked (dapm,"LDO2" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic Det Power" ); +snd_soc_dapm_sync_unlocked (dapm); +snd_soc_dapm_mutex_unlock (dapm); } }static int rt5645_jack_detect (struct snd_soc_codec *codec,int jack_insert) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);struct rt5645_priv *rt5645 =snd_soc_codec_get_drvdata (codec);unsigned int val;
@@ -2811,10 +2805,9 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)if (codec->component.card->instantiated) {/* for jack type detect */ -snd_soc_dapm_force_enable_pin (&codec->dapm,"LDO2" ); -snd_soc_dapm_force_enable_pin (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_force_enable_pin (dapm,"LDO2" ); +snd_soc_dapm_force_enable_pin (dapm,"Mic Det Power" ); +snd_soc_dapm_sync (dapm); }else {/* Power up necessary bits for JD if dapm is not ready yet */
@@ -2847,9 +2840,8 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) } }else {if (codec->component.card->instantiated) { -snd_soc_dapm_disable_pin (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_disable_pin (dapm,"Mic Det Power" ); +snd_soc_dapm_sync (dapm); }else regmap_update_bits (rt5645->regmap,RT5645_PWR_VOL ,RT5645_PWR_MIC_DET ,0 );
@@ -2863,11 +2855,9 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)else {if (codec->component.card->instantiated) {if (rt5645->pdata.jd_mode ==0 ) -snd_soc_dapm_disable_pin (&codec->dapm, -"LDO2" ); -snd_soc_dapm_disable_pin (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_disable_pin (dapm,"LDO2" ); +snd_soc_dapm_disable_pin (dapm,"Mic Det Power" ); +snd_soc_dapm_sync (dapm); }else {if (rt5645->pdata.jd_mode ==0 ) regmap_update_bits(rt5645->regmap,
@@ -3043,21 +3033,22 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645)static int rt5645_probe (struct snd_soc_codec *codec) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);struct rt5645_priv *rt5645 =snd_soc_codec_get_drvdata (codec); rt5645->codec = codec;switch (rt5645->codec_type) {case CODEC_TYPE_RT5645 : -snd_soc_dapm_add_routes (&codec->dapm, +snd_soc_dapm_add_routes (dapm, rt5645_specific_dapm_routes,ARRAY_SIZE (rt5645_specific_dapm_routes));break ;case CODEC_TYPE_RT5650 : -snd_soc_dapm_new_controls (&codec->dapm, +snd_soc_dapm_new_controls (dapm, rt5650_specific_dapm_widgets,ARRAY_SIZE (rt5650_specific_dapm_widgets)); -snd_soc_dapm_add_routes (&codec->dapm, +snd_soc_dapm_add_routes (dapm, rt5650_specific_dapm_routes,ARRAY_SIZE (rt5650_specific_dapm_routes));break ;
@@ -3067,9 +3058,9 @@ static int rt5645_probe(struct snd_soc_codec *codec)/* for JD function */ if (rt5645->pdata.jd_mode) { -snd_soc_dapm_force_enable_pin (&codec->dapm,"JD Power" ); -snd_soc_dapm_force_enable_pin (&codec->dapm,"LDO2" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_force_enable_pin (dapm,"JD Power" ); +snd_soc_dapm_force_enable_pin (dapm,"LDO2" ); +snd_soc_dapm_sync (dapm); }return 0 ;
Signature · 1 line
2.1.4
PATCH 2/6 ASoC: tas571x: Replace direct snd_soc_codec dapm field access
The dapm field of the snd_soc_codec struct is eventually going to be removed, in preparation for this replace all manual access to codec->dapm.bias_level with snd_soc_codec_get_bias_level().
--- sound/soc/codecs/tas571x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tas571x.c +1 -1
@@ -179,7 +179,7 @@ static int tas571x_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_PREPARE :break ;case SND_SOC_BIAS_STANDBY : -if (codec->dapm.bias_level ==SND_SOC_BIAS_OFF ) { +if (snd_soc_codec_get_bias_level (codec) ==SND_SOC_BIAS_OFF ) {if (!IS_ERR (priv->mclk)) { ret =clk_prepare_enable (priv->mclk);if (ret) {
Signature · 1 line
2.1.4
Re: [PATCH 2/6] ASoC: tas571x: Replace direct snd_soc_codec dapm field access
Quoted 23 lines · Lars-Peter Clausen
The dapm field of the
snd_soc_codecstruct is eventually going to be removed, in preparation for this replace all manual access tocodec->dapm.bias_levelwithsnd_soc_codec_get_bias_level().Signed-off-by Lars-Peter Clausen <[email protected]>--- sound/soc/codecs/tas571x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/codecs/tas571x.c +1
-2@@ -179,7 +179,7 @@ static int tas571x_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_PREPARE :break ;case SND_SOC_BIAS_STANDBY : -if (codec->dapm.bias_level ==SND_SOC_BIAS_OFF ) { +if (snd_soc_codec_get_bias_level (codec) ==SND_SOC_BIAS_OFF ) {if (!IS_ERR (priv->mclk)) { ret =clk_prepare_enable (priv->mclk);if (ret) { --
Quoted 2 lines
2.1.4
Mark Brown
maintainerApplied "ASoC: tas571x: Replace direct snd_soc_codec dapm field access" to the asoc tree
In reply to Lars-Peter ClausenThe patch
ASoC: tas571x: Replace direct snd_soc_codec dapm field access
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
8f218fa93d20a7b4ef8a088e5eed2d84b8ef4ab5Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <[email protected]>
Date: Mon, 6 Jul 2015 15:38:07 +0200
Subject: [PATCH] ASoC: tas571x: Replace direct snd_soc_codec dapm field access
The dapm field of the snd_soc_codec struct is eventually going to be removed, in preparation for this replace all manual access to codec->dapm.bias_level with snd_soc_codec_get_bias_level().
--- sound/soc/codecs/tas571x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tas571x.c +1 -1
@@ -179,7 +179,7 @@ static int tas571x_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_PREPARE :break ;case SND_SOC_BIAS_STANDBY : -if (codec->dapm.bias_level ==SND_SOC_BIAS_OFF ) { +if (snd_soc_codec_get_bias_level (codec) ==SND_SOC_BIAS_OFF ) {if (!IS_ERR (priv->mclk)) { ret =clk_prepare_enable (priv->mclk);if (ret) {
Signature · 1 line
2.1.4
PATCH 3/6 ASoC: omap3pandora: Use card DAPM context to access widgets
In reply to Lars-Peter ClausenThe dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context.
--- sound/soc/omap/omap3pandora.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/omap/omap3pandora.c +2 -4
@@ -154,8 +154,7 @@ static const struct snd_soc_dapm_route omap3pandora_map[] = {static int omap3pandora_out_init (struct snd_soc_pcm_runtime *rtd) { -struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm; +struct snd_soc_dapm_context *dapm = &rtd->card->dapm;/* All TWL4030 output pins are floating */ snd_soc_dapm_nc_pin (dapm,"EARPIECE" );
@@ -174,8 +173,7 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)static int omap3pandora_in_init (struct snd_soc_pcm_runtime *rtd) { -struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm; +struct snd_soc_dapm_context *dapm = &rtd->card->dapm;/* Not comnnected */ snd_soc_dapm_nc_pin (dapm,"HSMIC" );
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: omap3pandora: Use card DAPM context to access widgets" to the asoc tree
The patch
ASoC: omap3pandora: Use card DAPM context to access widgets
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
987731bb7c80b170228e6e1acf2e7b91efb51100Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <[email protected]>
Date: Mon, 6 Jul 2015 15:38:08 +0200
Subject: [PATCH] ASoC: omap3pandora: Use card DAPM context to access widgets
The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context.
--- sound/soc/omap/omap3pandora.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/omap/omap3pandora.c +2 -4
@@ -154,8 +154,7 @@ static const struct snd_soc_dapm_route omap3pandora_map[] = {static int omap3pandora_out_init (struct snd_soc_pcm_runtime *rtd) { -struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm; +struct snd_soc_dapm_context *dapm = &rtd->card->dapm;/* All TWL4030 output pins are floating */ snd_soc_dapm_nc_pin (dapm,"EARPIECE" );
@@ -174,8 +173,7 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)static int omap3pandora_in_init (struct snd_soc_pcm_runtime *rtd) { -struct snd_soc_codec *codec = rtd->codec; -struct snd_soc_dapm_context *dapm = &codec->dapm; +struct snd_soc_dapm_context *dapm = &rtd->card->dapm;/* Not comnnected */ snd_soc_dapm_nc_pin (dapm,"HSMIC" );
Signature · 1 line
2.1.4
PATCH 4/6 ASoC: cht_bsw_max98090_ti: Use card DAPM context to access widgets
In reply to Lars-Peter ClausenThe dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context.
While we are at it also remove some extra newlines.
--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
sound/soc/intel/boards/cht_bsw_max98090_ti.c +7 -11
@@ -104,21 +104,17 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream,static int cht_ti_jack_event (struct notifier_block *nb,unsigned long event,void *data) { -struct snd_soc_jack *jack = (struct snd_soc_jack *)data; -struct snd_soc_dai *codec_dai = jack->card->rtd->codec_dai; -struct snd_soc_codec *codec = codec_dai->codec; +struct snd_soc_dapm_context *dapm = &jack->card->dapm;if (event &SND_JACK_MICROPHONE ) { - -snd_soc_dapm_force_enable_pin (&codec->dapm,"SHDN" ); -snd_soc_dapm_force_enable_pin (&codec->dapm,"MICBIAS" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_force_enable_pin (dapm,"SHDN" ); +snd_soc_dapm_force_enable_pin (dapm,"MICBIAS" ); +snd_soc_dapm_sync (dapm); }else { - -snd_soc_dapm_disable_pin (&codec->dapm,"MICBIAS" ); -snd_soc_dapm_disable_pin (&codec->dapm,"SHDN" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +snd_soc_dapm_disable_pin (dapm,"SHDN" ); +snd_soc_dapm_sync (dapm); }return 0 ;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: cht_bsw_max98090_ti: Use card DAPM context to access widgets" to the asoc tree
The patch
ASoC: cht_bsw_max98090_ti: Use card DAPM context to access widgets
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
c68c2be5f6ae4a27d548921bf8b32413c5eab8edMon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <[email protected]>
Date: Mon, 6 Jul 2015 15:38:09 +0200
Subject: [PATCH] ASoC: cht_bsw_max98090_ti: Use card DAPM context to access
widgets
The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context.
While we are at it also remove some extra newlines.
--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
sound/soc/intel/boards/cht_bsw_max98090_ti.c +7 -11
@@ -104,21 +104,17 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream,static int cht_ti_jack_event (struct notifier_block *nb,unsigned long event,void *data) { -struct snd_soc_jack *jack = (struct snd_soc_jack *)data; -struct snd_soc_dai *codec_dai = jack->card->rtd->codec_dai; -struct snd_soc_codec *codec = codec_dai->codec; +struct snd_soc_dapm_context *dapm = &jack->card->dapm;if (event &SND_JACK_MICROPHONE ) { - -snd_soc_dapm_force_enable_pin (&codec->dapm,"SHDN" ); -snd_soc_dapm_force_enable_pin (&codec->dapm,"MICBIAS" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_force_enable_pin (dapm,"SHDN" ); +snd_soc_dapm_force_enable_pin (dapm,"MICBIAS" ); +snd_soc_dapm_sync (dapm); }else { - -snd_soc_dapm_disable_pin (&codec->dapm,"MICBIAS" ); -snd_soc_dapm_disable_pin (&codec->dapm,"SHDN" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_disable_pin (dapm,"MICBIAS" ); +snd_soc_dapm_disable_pin (dapm,"SHDN" ); +snd_soc_dapm_sync (dapm); }return 0 ;
Signature · 1 line
2.1.4
PATCH 5/6 ASoC: dapm_widget_show_codec: Use component instead of CODEC
In reply to Lars-Peter ClausenThere is nothing snd_soc_codec specific in this function, just use snd_soc_component instead.
With this also the last reference of snd_soc_codec form soc-dapm.c.
--- sound/soc/soc-dapm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
sound/soc/soc-dapm.c +9 -6
@@ -2220,14 +2220,16 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, }EXPORT_SYMBOL_GPL (snd_soc_dapm_mixer_update_power); -static ssize_t dapm_widget_show_codec (struct snd_soc_codec *codec,char *buf) +static ssize_t dapm_widget_show_component (struct snd_soc_component *cmpnt, +char *buf) { +struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (cmpnt);struct snd_soc_dapm_widget *w;int count =0 ;char *state ="not set" ; -list_for_each_entry (w, &codec->component.card->widgets, list) { -if (w->dapm != &codec->dapm) +list_for_each_entry (w, &cmpnt->card->widgets, list) { +if (w->dapm != dapm)continue ;/* only display widgets that burnm power */
@@ -2255,7 +2257,7 @@ static ssize_t dapm_widget_show_codec(struct snd_soc_codec *codec, char *buf) } } -switch (codec->dapm.bias_level) { +switch (snd_soc_dapm_get_bias_level (dapm)) {case SND_SOC_BIAS_ON : state ="On" ;break ;
@@ -2282,8 +2284,9 @@ static ssize_t dapm_widget_show(struct device *dev,int i, count =0 ;for (i =0 ; i < rtd->num_codecs; i++) { -struct snd_soc_codec *codec = rtd->codec_dais[i]->codec; - count +=dapm_widget_show_codec (codec, buf + count); +struct snd_soc_component *cmpnt = rtd->codec_dais[i]->component; + + count +=dapm_widget_show_component (cmpnt, buf + count); }return count;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: dapm_widget_show_codec: Use component instead of CODEC" to the asoc tree
The patch
ASoC: dapm_widget_show_codec: Use component instead of CODEC
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
b3c25fb7caa30afa5d5cc6b414a5b4d66bed77a7Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <[email protected]>
Date: Mon, 6 Jul 2015 15:38:10 +0200
Subject: [PATCH] ASoC: dapm_widget_show_codec: Use component instead of CODEC
There is nothing snd_soc_codec specific in this function, just use snd_soc_component instead.
With this also the last reference of snd_soc_codec form soc-dapm.c.
--- sound/soc/soc-dapm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
sound/soc/soc-dapm.c +9 -6
@@ -2220,14 +2220,16 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, }EXPORT_SYMBOL_GPL (snd_soc_dapm_mixer_update_power); -static ssize_t dapm_widget_show_codec (struct snd_soc_codec *codec,char *buf) +static ssize_t dapm_widget_show_component (struct snd_soc_component *cmpnt, +char *buf) { +struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (cmpnt);struct snd_soc_dapm_widget *w;int count =0 ;char *state ="not set" ; -list_for_each_entry (w, &codec->component.card->widgets, list) { -if (w->dapm != &codec->dapm) +list_for_each_entry (w, &cmpnt->card->widgets, list) { +if (w->dapm != dapm)continue ;/* only display widgets that burnm power */
@@ -2255,7 +2257,7 @@ static ssize_t dapm_widget_show_codec(struct snd_soc_codec *codec, char *buf) } } -switch (codec->dapm.bias_level) { +switch (snd_soc_dapm_get_bias_level (dapm)) {case SND_SOC_BIAS_ON : state ="On" ;break ;
@@ -2282,8 +2284,9 @@ static ssize_t dapm_widget_show(struct device *dev,int i, count =0 ;for (i =0 ; i < rtd->num_codecs; i++) { -struct snd_soc_codec *codec = rtd->codec_dais[i]->codec; - count +=dapm_widget_show_codec (codec, buf + count); +struct snd_soc_component *cmpnt = rtd->codec_dais[i]->component; + + count +=dapm_widget_show_component (cmpnt, buf + count); }return count;
Signature · 1 line
2.1.4
PATCH 6/6 ASoC: Remove snd_soc_codec dapm field
In reply to Lars-Peter ClausenThere are no more direct users of the snd_soc_codec DAPM field left. So we can finally remove it and switch over to directly using the component DAPM context and remove the dapm_ptr indirection.
--- include/sound/soc.h | 10 +++------- sound/soc/soc-core.c | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-)
include/sound/soc.h +3 -7
@@ -792,7 +792,6 @@ struct snd_soc_component {/* Don't use these, use snd_soc_component_get_dapm() */ struct snd_soc_dapm_context dapm; -struct snd_soc_dapm_context *dapm_ptr;const struct snd_kcontrol_new *controls;unsigned int num_controls;
@@ -832,9 +831,6 @@ struct snd_soc_codec {/* component */ struct snd_soc_component component; -/* Don't access this directly, use snd_soc_codec_get_dapm() */ -struct snd_soc_dapm_context dapm; -#ifdef CONFIG_DEBUG_FS struct dentry *debugfs_reg;#endif
@@ -1277,7 +1273,7 @@ static inline struct snd_soc_component *snd_soc_dapm_to_component(static inline struct snd_soc_codec *snd_soc_dapm_to_codec (struct snd_soc_dapm_context *dapm) { - return container_of(dapm, struct snd_soc_codec, dapm); +return snd_soc_component_to_codec (snd_soc_dapm_to_component (dapm)); }/**
@@ -1302,7 +1298,7 @@ static inline struct snd_soc_platform *snd_soc_dapm_to_platform(static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm (struct snd_soc_component *component) { -return component->dapm_ptr; +return &component->dapm; }/**
@@ -1314,7 +1310,7 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(static inline struct snd_soc_dapm_context *snd_soc_codec_get_dapm (struct snd_soc_codec *codec) { -return &codec->dapm; +return snd_soc_component_get_dapm (&codec->component); }/**
sound/soc/soc-core.c +12 -11
@@ -654,10 +654,12 @@ int snd_soc_suspend(struct device *dev)/* suspend all CODECs */ list_for_each_entry (codec, &card->codec_dev_list, card_list) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +/* If there are paths active then the CODEC will be held with * bias _ON and should not be suspended. */ if (!codec->suspended) { -switch (codec->dapm.bias_level) { +switch (snd_soc_dapm_get_bias_level (dapm)) {case SND_SOC_BIAS_STANDBY :/* * If the CODEC is capable of idle
@@ -665,7 +667,7 @@ int snd_soc_suspend(struct device *dev)* means it's doing something, * otherwise fall through. */ -if (codec->dapm.idle_bias_off) { +if (dapm->idle_bias_off) {dev_dbg (codec->dev,"ASoC: idle_bias_off CODEC on over suspend\n" );break ;
@@ -2651,10 +2653,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, component->probe = component->driver->probe; component->remove = component->driver->remove; -if (!component->dapm_ptr) - component->dapm_ptr = &component->dapm; - - dapm = component->dapm_ptr; + dapm = &component->dapm; dapm->dev = dev; dapm->component = component; dapm->bias_level =SND_SOC_BIAS_OFF ;
@@ -3036,6 +3035,7 @@ int snd_soc_register_codec(struct device *dev, struct snd_soc_dai_driver *dai_drv, int num_dai) { +struct snd_soc_dapm_context *dapm;struct snd_soc_codec *codec;struct snd_soc_dai *dai;int ret, i;
@@ -3046,7 +3046,6 @@ int snd_soc_register_codec(struct device *dev,if (codec ==NULL )return -ENOMEM ; - codec->component.dapm_ptr = &codec->dapm; codec->component.codec = codec; ret = snd_soc_component_initialize(&codec->component,
@@ -3076,12 +3075,14 @@ int snd_soc_register_codec(struct device *dev,if (codec_drv->read) codec->component.read = snd_soc_codec_drv_read; codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time; - codec->dapm.idle_bias_off = codec_drv->idle_bias_off; - codec->dapm.suspend_bias_off = codec_drv->suspend_bias_off; + + dapm =snd_soc_codec_get_dapm (codec); + dapm->idle_bias_off = codec_drv->idle_bias_off; + dapm->suspend_bias_off = codec_drv->suspend_bias_off;if (codec_drv->seq_notifier) - codec->dapm.seq_notifier = codec_drv->seq_notifier; + dapm->seq_notifier = codec_drv->seq_notifier;if (codec_drv->set_bias_level) - codec->dapm.set_bias_level = snd_soc_codec_set_bias_level; + dapm->set_bias_level = snd_soc_codec_set_bias_level; codec->dev = dev; codec->driver = codec_drv; codec->component.val_bytes = codec_drv->reg_word_size;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: Remove snd_soc_codec dapm field" to the asoc tree
The patch
ASoC: Remove snd_soc_codec dapm field
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
4890140f3888b4a4baef90d84e278858afe45248Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <[email protected]>
Date: Mon, 6 Jul 2015 15:38:11 +0200
Subject: [PATCH] ASoC: Remove snd_soc_codec dapm field
There are no more direct users of the snd_soc_codec DAPM field left. So we can finally remove it and switch over to directly using the component DAPM context and remove the dapm_ptr indirection.
--- include/sound/soc.h | 10 +++------- sound/soc/soc-core.c | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-)
include/sound/soc.h +3 -7
@@ -792,7 +792,6 @@ struct snd_soc_component {/* Don't use these, use snd_soc_component_get_dapm() */ struct snd_soc_dapm_context dapm; -struct snd_soc_dapm_context *dapm_ptr;const struct snd_kcontrol_new *controls;unsigned int num_controls;
@@ -832,9 +831,6 @@ struct snd_soc_codec {/* component */ struct snd_soc_component component; -/* Don't access this directly, use snd_soc_codec_get_dapm() */ -struct snd_soc_dapm_context dapm; -#ifdef CONFIG_DEBUG_FS struct dentry *debugfs_reg;#endif
@@ -1277,7 +1273,7 @@ static inline struct snd_soc_component *snd_soc_dapm_to_component(static inline struct snd_soc_codec *snd_soc_dapm_to_codec (struct snd_soc_dapm_context *dapm) { - return container_of(dapm, struct snd_soc_codec, dapm); +return snd_soc_component_to_codec (snd_soc_dapm_to_component (dapm)); }/**
@@ -1302,7 +1298,7 @@ static inline struct snd_soc_platform *snd_soc_dapm_to_platform(static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm (struct snd_soc_component *component) { -return component->dapm_ptr; +return &component->dapm; }/**
@@ -1314,7 +1310,7 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(static inline struct snd_soc_dapm_context *snd_soc_codec_get_dapm (struct snd_soc_codec *codec) { -return &codec->dapm; +return snd_soc_component_get_dapm (&codec->component); }/**
sound/soc/soc-core.c +12 -11
@@ -654,10 +654,12 @@ int snd_soc_suspend(struct device *dev)/* suspend all CODECs */ list_for_each_entry (codec, &card->codec_dev_list, card_list) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +/* If there are paths active then the CODEC will be held with * bias _ON and should not be suspended. */ if (!codec->suspended) { -switch (codec->dapm.bias_level) { +switch (snd_soc_dapm_get_bias_level (dapm)) {case SND_SOC_BIAS_STANDBY :/* * If the CODEC is capable of idle
@@ -665,7 +667,7 @@ int snd_soc_suspend(struct device *dev)* means it's doing something, * otherwise fall through. */ -if (codec->dapm.idle_bias_off) { +if (dapm->idle_bias_off) {dev_dbg (codec->dev,"ASoC: idle_bias_off CODEC on over suspend\n" );break ;
@@ -2651,10 +2653,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, component->probe = component->driver->probe; component->remove = component->driver->remove; -if (!component->dapm_ptr) - component->dapm_ptr = &component->dapm; - - dapm = component->dapm_ptr; + dapm = &component->dapm; dapm->dev = dev; dapm->component = component; dapm->bias_level =SND_SOC_BIAS_OFF ;
@@ -3036,6 +3035,7 @@ int snd_soc_register_codec(struct device *dev, struct snd_soc_dai_driver *dai_drv, int num_dai) { +struct snd_soc_dapm_context *dapm;struct snd_soc_codec *codec;struct snd_soc_dai *dai;int ret, i;
@@ -3046,7 +3046,6 @@ int snd_soc_register_codec(struct device *dev,if (codec ==NULL )return -ENOMEM ; - codec->component.dapm_ptr = &codec->dapm; codec->component.codec = codec; ret = snd_soc_component_initialize(&codec->component,
@@ -3076,12 +3075,14 @@ int snd_soc_register_codec(struct device *dev,if (codec_drv->read) codec->component.read = snd_soc_codec_drv_read; codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time; - codec->dapm.idle_bias_off = codec_drv->idle_bias_off; - codec->dapm.suspend_bias_off = codec_drv->suspend_bias_off; + + dapm =snd_soc_codec_get_dapm (codec); + dapm->idle_bias_off = codec_drv->idle_bias_off; + dapm->suspend_bias_off = codec_drv->suspend_bias_off;if (codec_drv->seq_notifier) - codec->dapm.seq_notifier = codec_drv->seq_notifier; + dapm->seq_notifier = codec_drv->seq_notifier;if (codec_drv->set_bias_level) - codec->dapm.set_bias_level = snd_soc_codec_set_bias_level; + dapm->set_bias_level = snd_soc_codec_set_bias_level; codec->dev = dev; codec->driver = codec_drv; codec->component.val_bytes = codec_drv->reg_word_size;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: rt5645: Replace direct snd_soc_codec dapm field access" to the asoc tree
In reply to Lars-Peter ClausenThe patch
ASoC: rt5645: Replace direct snd_soc_codec dapm field access
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
e2ada8187bc8b46c30a623e7d6b5a72c209f70cdMon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <[email protected]>
Date: Mon, 6 Jul 2015 15:38:06 +0200
Subject: [PATCH] ASoC: rt5645: Replace direct snd_soc_codec dapm field access
The dapm field of the snd_soc_codec struct is eventually going to be removed, in preparation for this replace all manual access to codec->dapm.bias_level with snd_soc_codec_get_bias_level() and replace all other manual access to codec->dapm with snd_soc_codec_get_dapm().
--- sound/soc/codecs/rt5645.c | 73 +++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 41 deletions(-)
sound/soc/codecs/rt5645.c +32 -41
@@ -2642,7 +2642,7 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,switch (level) {case SND_SOC_BIAS_PREPARE : -if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) { +if (SND_SOC_BIAS_STANDBY ==snd_soc_codec_get_bias_level (codec)) { snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_BG | RT5645_PWR_VREF2,
@@ -2760,20 +2760,17 @@ static int rt5650_calibration(struct rt5645_priv *rt5645)static void rt5645_enable_push_button_irq (struct snd_soc_codec *codec,bool enable) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);struct rt5645_priv *rt5645 =snd_soc_codec_get_drvdata (codec);if (enable) { -snd_soc_dapm_mutex_lock (&codec->dapm); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"ADC L power" ); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"ADC R power" ); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"LDO2" ); -snd_soc_dapm_force_enable_pin_unlocked (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync_unlocked (&codec->dapm); -snd_soc_dapm_mutex_unlock (&codec->dapm); +snd_soc_dapm_mutex_lock (dapm); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"ADC L power" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"ADC R power" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"LDO2" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"Mic Det Power" ); +snd_soc_dapm_sync_unlocked (dapm); +snd_soc_dapm_mutex_unlock (dapm);snd_soc_update_bits (codec,RT5645_INT_IRQ_ST ,0x8 ,0x8 );
@@ -2786,23 +2783,20 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,snd_soc_update_bits (codec,RT5650_4BTN_IL_CMD2 ,0x8000 ,0x0 );snd_soc_update_bits (codec,RT5645_INT_IRQ_ST ,0x8 ,0x0 ); -snd_soc_dapm_mutex_lock (&codec->dapm); -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"ADC L power" ); -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"ADC R power" ); +snd_soc_dapm_mutex_lock (dapm); +snd_soc_dapm_disable_pin_unlocked (dapm,"ADC L power" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"ADC R power" );if (rt5645->pdata.jd_mode ==0 ) -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"LDO2" ); -snd_soc_dapm_disable_pin_unlocked (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync_unlocked (&codec->dapm); -snd_soc_dapm_mutex_unlock (&codec->dapm); +snd_soc_dapm_disable_pin_unlocked (dapm,"LDO2" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic Det Power" ); +snd_soc_dapm_sync_unlocked (dapm); +snd_soc_dapm_mutex_unlock (dapm); } }static int rt5645_jack_detect (struct snd_soc_codec *codec,int jack_insert) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);struct rt5645_priv *rt5645 =snd_soc_codec_get_drvdata (codec);unsigned int val;
@@ -2811,10 +2805,9 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)if (codec->component.card->instantiated) {/* for jack type detect */ -snd_soc_dapm_force_enable_pin (&codec->dapm,"LDO2" ); -snd_soc_dapm_force_enable_pin (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_force_enable_pin (dapm,"LDO2" ); +snd_soc_dapm_force_enable_pin (dapm,"Mic Det Power" ); +snd_soc_dapm_sync (dapm); }else {/* Power up necessary bits for JD if dapm is not ready yet */
@@ -2847,9 +2840,8 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) } }else {if (codec->component.card->instantiated) { -snd_soc_dapm_disable_pin (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_disable_pin (dapm,"Mic Det Power" ); +snd_soc_dapm_sync (dapm); }else regmap_update_bits (rt5645->regmap,RT5645_PWR_VOL ,RT5645_PWR_MIC_DET ,0 );
@@ -2863,11 +2855,9 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)else {if (codec->component.card->instantiated) {if (rt5645->pdata.jd_mode ==0 ) -snd_soc_dapm_disable_pin (&codec->dapm, -"LDO2" ); -snd_soc_dapm_disable_pin (&codec->dapm, -"Mic Det Power" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_disable_pin (dapm,"LDO2" ); +snd_soc_dapm_disable_pin (dapm,"Mic Det Power" ); +snd_soc_dapm_sync (dapm); }else {if (rt5645->pdata.jd_mode ==0 ) regmap_update_bits(rt5645->regmap,
@@ -3043,21 +3033,22 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645)static int rt5645_probe (struct snd_soc_codec *codec) { +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec);struct rt5645_priv *rt5645 =snd_soc_codec_get_drvdata (codec); rt5645->codec = codec;switch (rt5645->codec_type) {case CODEC_TYPE_RT5645 : -snd_soc_dapm_add_routes (&codec->dapm, +snd_soc_dapm_add_routes (dapm, rt5645_specific_dapm_routes,ARRAY_SIZE (rt5645_specific_dapm_routes));break ;case CODEC_TYPE_RT5650 : -snd_soc_dapm_new_controls (&codec->dapm, +snd_soc_dapm_new_controls (dapm, rt5650_specific_dapm_widgets,ARRAY_SIZE (rt5650_specific_dapm_widgets)); -snd_soc_dapm_add_routes (&codec->dapm, +snd_soc_dapm_add_routes (dapm, rt5650_specific_dapm_routes,ARRAY_SIZE (rt5650_specific_dapm_routes));break ;
@@ -3067,9 +3058,9 @@ static int rt5645_probe(struct snd_soc_codec *codec)/* for JD function */ if (rt5645->pdata.jd_mode) { -snd_soc_dapm_force_enable_pin (&codec->dapm,"JD Power" ); -snd_soc_dapm_force_enable_pin (&codec->dapm,"LDO2" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_force_enable_pin (dapm,"JD Power" ); +snd_soc_dapm_force_enable_pin (dapm,"LDO2" ); +snd_soc_dapm_sync (dapm); }return 0 ;
Signature · 1 line
2.1.4