ASoC: Remove needless snd_soc_dapm_enable_pin() from machine driver inits
ALSA SoC core marks widgets as connected by default when they are initialized in snd_soc_dapm_new_control() so there is no need to call snd_soc_dapm_enable_pin() from machine driver init functions. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
831ffa45e7
commit
d77a14b579
|
@ -80,17 +80,6 @@ static const struct snd_soc_dapm_route afeb9260_audio_map[] = {
|
|||
{"MICIN", NULL, "Mic Jack"},
|
||||
};
|
||||
|
||||
static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Line In");
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Digital audio interface glue - connects codec <--> CPU */
|
||||
static struct snd_soc_dai_link afeb9260_dai = {
|
||||
|
@ -100,7 +89,6 @@ static struct snd_soc_dai_link afeb9260_dai = {
|
|||
.codec_dai_name = "tlv320aic23-hifi",
|
||||
.platform_name = "atmel_pcm-audio",
|
||||
.codec_name = "tlv320aic23-codec.0-001a",
|
||||
.init = afeb9260_tlv320aic23_init,
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
|
||||
SND_SOC_DAIFMT_CBM_CFM,
|
||||
.ops = &afeb9260_ops,
|
||||
|
|
|
@ -100,11 +100,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
|
|||
snd_soc_dapm_ignore_suspend(dapm, "SPORP");
|
||||
snd_soc_dapm_ignore_suspend(dapm, "SPORN");
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Headset Mic");
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone");
|
||||
snd_soc_dapm_enable_pin(dapm, "Speaker");
|
||||
snd_soc_dapm_enable_pin(dapm, "Internal Mic");
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -89,8 +89,6 @@ static struct snd_soc_ops haswell_rt5640_ops = {
|
|||
|
||||
static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev);
|
||||
struct sst_hsw *haswell = pdata->dsp;
|
||||
int ret;
|
||||
|
@ -104,10 +102,6 @@ static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/* always connected */
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphones");
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -52,18 +52,6 @@ static const struct snd_soc_dapm_route t5325_route[] = {
|
|||
{ "MIC2", NULL, "Mic Jack" },
|
||||
};
|
||||
|
||||
static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Speaker");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_soc_dai_link t5325_dai[] = {
|
||||
{
|
||||
.name = "ALC5621",
|
||||
|
@ -74,7 +62,6 @@ static struct snd_soc_dai_link t5325_dai[] = {
|
|||
.codec_name = "alc562x-codec.0-001a",
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
|
||||
.ops = &t5325_ops,
|
||||
.init = t5325_dai_init,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -541,8 +541,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
|
|||
|
||||
/* Set up initial pin constellation */
|
||||
snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
|
||||
snd_soc_dapm_enable_pin(dapm, "Earpiece");
|
||||
snd_soc_dapm_enable_pin(dapm, "Microphone");
|
||||
snd_soc_dapm_disable_pin(dapm, "Speaker");
|
||||
snd_soc_dapm_disable_pin(dapm, "AGCIN");
|
||||
snd_soc_dapm_disable_pin(dapm, "AGCOUT");
|
||||
|
|
|
@ -50,11 +50,6 @@ static int brownstone_wm8994_init(struct snd_soc_pcm_runtime *rtd)
|
|||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
|
||||
snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
|
||||
snd_soc_dapm_enable_pin(dapm, "Headset Mic");
|
||||
snd_soc_dapm_enable_pin(dapm, "Main Mic");
|
||||
|
||||
/* set endpoints to not connected */
|
||||
snd_soc_dapm_nc_pin(dapm, "HPOUT2P");
|
||||
snd_soc_dapm_nc_pin(dapm, "HPOUT2N");
|
||||
|
|
|
@ -79,14 +79,6 @@ static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
|
|||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
int err;
|
||||
|
||||
/* connected pins */
|
||||
if (machine_is_palmld())
|
||||
snd_soc_dapm_enable_pin(dapm, "MIC1");
|
||||
snd_soc_dapm_enable_pin(dapm, "HPOUTL");
|
||||
snd_soc_dapm_enable_pin(dapm, "HPOUTR");
|
||||
snd_soc_dapm_enable_pin(dapm, "LOUT2");
|
||||
snd_soc_dapm_enable_pin(dapm, "ROUT2");
|
||||
|
||||
/* not connected pins */
|
||||
snd_soc_dapm_nc_pin(dapm, "OUT3");
|
||||
snd_soc_dapm_nc_pin(dapm, "MONOOUT");
|
||||
|
|
|
@ -230,7 +230,6 @@ static int poodle_wm8731_init(struct snd_soc_pcm_runtime *rtd)
|
|||
|
||||
snd_soc_dapm_nc_pin(dapm, "LLINEIN");
|
||||
snd_soc_dapm_nc_pin(dapm, "RLINEIN");
|
||||
snd_soc_dapm_enable_pin(dapm, "MICIN");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -78,10 +78,6 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd)
|
|||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
/* connected pins */
|
||||
snd_soc_dapm_enable_pin(dapm, "Ext Speaker");
|
||||
snd_soc_dapm_enable_pin(dapm, "Ext Mic 1");
|
||||
snd_soc_dapm_enable_pin(dapm, "Ext Mic 3");
|
||||
snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
|
||||
snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
|
||||
|
||||
|
|
|
@ -176,11 +176,6 @@ static struct platform_device *s3c24xx_snd_device;
|
|||
static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Speaker");
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
|
||||
snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
|
||||
&hp_jack);
|
||||
|
|
|
@ -221,11 +221,6 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
|
|||
static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Speaker");
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
|
||||
snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
|
||||
&hp_jack);
|
||||
|
|
|
@ -63,14 +63,6 @@ static const struct snd_soc_dapm_route base_map[] = {
|
|||
*/
|
||||
static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Line In");
|
||||
snd_soc_dapm_enable_pin(dapm, "Line Out");
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
|
||||
simtec_audio_init(rtd);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -52,14 +52,6 @@ static const struct snd_soc_dapm_route base_map[] = {
|
|||
*/
|
||||
static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Line In");
|
||||
snd_soc_dapm_enable_pin(dapm, "Line Out");
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
|
||||
simtec_audio_init(rtd);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -162,8 +162,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
|
|||
snd_soc_dapm_nc_pin(dapm, "ROUT1");
|
||||
|
||||
/* set endpoints to default off mode */
|
||||
snd_soc_dapm_enable_pin(dapm, "Internal Speaker");
|
||||
snd_soc_dapm_enable_pin(dapm, "Internal Mic");
|
||||
snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
|
||||
|
||||
/* Headphone jack detection */
|
||||
|
|
|
@ -89,18 +89,6 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd)
|
|||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
/* HeadPhone */
|
||||
snd_soc_dapm_enable_pin(dapm, "HPOUT1R");
|
||||
snd_soc_dapm_enable_pin(dapm, "HPOUT1L");
|
||||
|
||||
/* MicIn */
|
||||
snd_soc_dapm_enable_pin(dapm, "IN1LN");
|
||||
snd_soc_dapm_enable_pin(dapm, "IN1RN");
|
||||
|
||||
/* LineIn */
|
||||
snd_soc_dapm_enable_pin(dapm, "IN2LN");
|
||||
snd_soc_dapm_enable_pin(dapm, "IN2RN");
|
||||
|
||||
/* Other pins NC */
|
||||
snd_soc_dapm_nc_pin(dapm, "HPOUT2P");
|
||||
snd_soc_dapm_nc_pin(dapm, "HPOUT2N");
|
||||
|
|
Loading…
Reference in New Issue