public inbox for alsa-devel@alsa-project.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org,
	liam.r.girdwood@linux.intel.com,
	Bard liao <yung-chuan.liao@linux.intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Bard Liao <bardliao@realtek.com>,
	Oder Chiou <oder_chiou@realtek.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 06/21] ASoC: rt5670: remove unused mux/mixer define
Date: Fri,  4 Jan 2019 20:02:34 -0600	[thread overview]
Message-ID: <20190105020249.8639-7-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190105020249.8639-1-pierre-louis.bossart@linux.intel.com>

From: Bard liao <yung-chuan.liao@linux.intel.com>

Some mux/mixer are not used. Remove them from the driver.

Signed-off-by: Bard liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/codecs/rt5670.c | 54 ---------------------------------------
 1 file changed, 54 deletions(-)

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 453328c988c0..9a037108b1ae 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -1057,20 +1057,6 @@ static const struct snd_kcontrol_new rt5670_lout_mix[] = {
 			RT5670_M_OV_R_LM_SFT, 1, 1),
 };
 
-static const struct snd_kcontrol_new rt5670_hpl_mix[] = {
-	SOC_DAPM_SINGLE("DAC L1 Switch", RT5670_HPO_MIXER,
-			RT5670_M_DACL1_HML_SFT, 1, 1),
-	SOC_DAPM_SINGLE("INL1 Switch", RT5670_HPO_MIXER,
-			RT5670_M_INL1_HML_SFT, 1, 1),
-};
-
-static const struct snd_kcontrol_new rt5670_hpr_mix[] = {
-	SOC_DAPM_SINGLE("DAC R1 Switch", RT5670_HPO_MIXER,
-			RT5670_M_DACR1_HMR_SFT, 1, 1),
-	SOC_DAPM_SINGLE("INR1 Switch", RT5670_HPO_MIXER,
-			RT5670_M_INR1_HMR_SFT, 1, 1),
-};
-
 static const struct snd_kcontrol_new lout_l_enable_control =
 	SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5670_LOUT1,
 		RT5670_L_MUTE_SFT, 1, 1);
@@ -1196,24 +1182,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc2_enum, RT5670_STO2_ADC_MIXER,
 static const struct snd_kcontrol_new rt5670_sto2_adc_2_mux =
 	SOC_DAPM_ENUM("Stereo2 ADC 2 Mux", rt5670_stereo2_adc2_enum);
 
-
-/* MX-27 MX26 [10] */
-static const char * const rt5670_stereo_adc_src[] = {
-	"ADC1L ADC2R", "ADC3"
-};
-
-static SOC_ENUM_SINGLE_DECL(rt5670_stereo1_adc_enum, RT5670_STO1_ADC_MIXER,
-	RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src);
-
-static const struct snd_kcontrol_new rt5670_sto_adc_mux =
-	SOC_DAPM_ENUM("Stereo1 ADC source", rt5670_stereo1_adc_enum);
-
-static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_adc_enum, RT5670_STO2_ADC_MIXER,
-	RT5670_ADC_SRC_SFT, rt5670_stereo_adc_src);
-
-static const struct snd_kcontrol_new rt5670_sto2_adc_mux =
-	SOC_DAPM_ENUM("Stereo2 ADC source", rt5670_stereo2_adc_enum);
-
 /* MX-27 MX-26 [9:8] */
 static const char * const rt5670_stereo_dmic_src[] = {
 	"DMIC1", "DMIC2", "DMIC3"
@@ -1231,17 +1199,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_stereo2_dmic_enum, RT5670_STO2_ADC_MIXER,
 static const struct snd_kcontrol_new rt5670_sto2_dmic_mux =
 	SOC_DAPM_ENUM("Stereo2 DMIC source", rt5670_stereo2_dmic_enum);
 
-/* MX-27 [0] */
-static const char * const rt5670_stereo_dmic3_src[] = {
-	"DMIC3", "PDM ADC"
-};
-
-static SOC_ENUM_SINGLE_DECL(rt5670_stereo_dmic3_enum, RT5670_STO1_ADC_MIXER,
-	RT5670_DMIC3_SRC_SFT, rt5670_stereo_dmic3_src);
-
-static const struct snd_kcontrol_new rt5670_sto_dmic3_mux =
-	SOC_DAPM_ENUM("Stereo DMIC3 source", rt5670_stereo_dmic3_enum);
-
 /* Mono ADC source */
 /* MX-28 [12] */
 static const char * const rt5670_mono_adc_l1_src[] = {
@@ -1334,17 +1291,6 @@ static SOC_ENUM_SINGLE_DECL(rt5670_if2_adc_in_enum, RT5670_DIG_INF1_DATA,
 static const struct snd_kcontrol_new rt5670_if2_adc_in_mux =
 	SOC_DAPM_ENUM("IF2 ADC IN source", rt5670_if2_adc_in_enum);
 
-/* MX-30 [5:4] */
-static const char * const rt5670_if4_adc_in_src[] = {
-	"IF_ADC1", "IF_ADC2", "IF_ADC3"
-};
-
-static SOC_ENUM_SINGLE_DECL(rt5670_if4_adc_in_enum, RT5670_DIG_INF2_DATA,
-	RT5670_IF4_ADC_IN_SFT, rt5670_if4_adc_in_src);
-
-static const struct snd_kcontrol_new rt5670_if4_adc_in_mux =
-	SOC_DAPM_ENUM("IF4 ADC IN source", rt5670_if4_adc_in_enum);
-
 /* MX-31 [15] [13] [11] [9] */
 static const char * const rt5670_pdm_src[] = {
 	"Mono DAC", "Stereo DAC"
-- 
2.17.1

  parent reply	other threads:[~2019-01-05  2:02 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-05  2:02 [PATCH 00/21] ASoC: codecs: remove warnings with Sparse, Coccinelle and W=1 Pierre-Louis Bossart
2019-01-05  2:02 ` [PATCH 01/21] ASoC: dmic: declare trigger function as static Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: dmic: declare trigger function as static" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 02/21] ASoC: max98090: remove unused constant variables Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: max98090: remove unused constant variables" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 03/21] ASoC: es8316: remove unused constant variables Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: es8316: remove unused constant variables" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 04/21] ASoC: codecs: fix kernel doc descriptions Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: codecs: fix kernel doc descriptions" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 05/21] ASoC: rt5645: remove unused mux define Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: rt5645: remove unused mux define" to the asoc tree Mark Brown
2019-01-05  2:02 ` Pierre-Louis Bossart [this message]
2019-01-07 18:58   ` Applied "ASoC: rt5670: remove unused mux/mixer " Mark Brown
2019-01-05  2:02 ` [PATCH 07/21] ASoC: max98383: fix boolean assignments to true/false Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: max98383: fix boolean assignments to true/false" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 08/21] ASoC: rt298: fix boolean tests Pierre-Louis Bossart
2019-01-07 18:57   ` Applied "ASoC: rt298: fix boolean tests" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 09/21] ASoC: cs4271: fix boolean assignments Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: cs4271: fix boolean assignments" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 10/21] ASoC: rt274: fix boolean tests Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: rt274: fix boolean tests" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 11/21] ASoc: rt286: fix boolean tests Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoc: rt286: fix boolean tests" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 12/21] ASoC: rt5640: fix boolean assignments Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: rt5640: fix boolean assignments" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 13/21] ASoC: max98927: fix boolean assignments Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: max98927: fix boolean assignments" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 14/21] ASoC: rt5651: fix boolean assignments Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: rt5651: fix boolean assignments" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 15/21] ASoC: nau8824: fix boolean assignment Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: nau8824: fix boolean assignment" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 16/21] ASoC: tscs42xx.c: fix boolean test Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: tscs42xx.c: fix boolean test" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 17/21] ASoC: mt6351: remove unneeded variable Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: mt6351: remove unneeded variable" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 18/21] ASoC: da7219: fix endianness issues Pierre-Louis Bossart
2019-01-07 13:27   ` Adam Thomson
2019-01-07 18:58   ` Applied "ASoC: da7219: fix endianness issues" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 19/21] ASoC: da7219: use logical AND Pierre-Louis Bossart
2019-01-07 13:26   ` Adam Thomson
2019-01-07 18:58   ` Applied "ASoC: da7219: use logical AND" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 20/21] ASoC: rt5645: store eq kcontrol byte in __be Pierre-Louis Bossart
2019-01-07 18:58   ` Applied "ASoC: rt5645: store eq kcontrol byte in __be" to the asoc tree Mark Brown
2019-01-05  2:02 ` [PATCH 21/21] ASoC: rl6437a: use __be32 for a __be32 buf Pierre-Louis Bossart
2019-01-07 18:57   ` Applied "ASoC: rl6437a: use __be32 for a __be32 buf" to the asoc tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190105020249.8639-7-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=bardliao@realtek.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oder_chiou@realtek.com \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    --cc=tiwai@suse.de \
    --cc=yung-chuan.liao@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox