diff mbox

[07/11] ASoC: mc13783: Use SOC_ENUM_SINGLE_VIRT_DECL()

Message ID 1393168221-23018-8-git-send-email-lars@metafoo.de (mailing list archive)
State Accepted
Commit 15ab40a9a83035d92b4f4c83cb88c7529bf73c71
Headers show

Commit Message

Lars-Peter Clausen Feb. 23, 2014, 3:10 p.m. UTC 
For the upcoming consolidation for MUXs and virtual MUXs we need to mark virtual
enums as such.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/codecs/mc13783.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Philippe Rétornaz Feb. 24, 2014, 2:28 p.m. UTC | #1 
Le 23/02/2014 16:10, Lars-Peter Clausen a écrit :
> For the upcoming consolidation for MUXs and virtual MUXs we need to mark virtual
> enums as such.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

Tested on mx31moboard, no regression.

Thanks,

Philippe


> ---
>   sound/soc/codecs/mc13783.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
> index c605036..ec89b8f 100644
> --- a/sound/soc/codecs/mc13783.c
> +++ b/sound/soc/codecs/mc13783.c
> @@ -408,8 +408,7 @@ static const char * const adcl_enum_text[] = {
>   	"MC1L", "RXINL",
>   };
>
> -static SOC_ENUM_SINGLE_DECL(adcl_enum,
> -			    0, 0, adcl_enum_text);
> +static SOC_ENUM_SINGLE_VIRT_DECL(adcl_enum, adcl_enum_text);
>
>   static const struct snd_kcontrol_new left_input_mux =
>   	SOC_DAPM_ENUM_VIRT("Route", adcl_enum);
> @@ -418,8 +417,7 @@ static const char * const adcr_enum_text[] = {
>   	"MC1R", "MC2", "RXINR", "TXIN",
>   };
>
> -static SOC_ENUM_SINGLE_DECL(adcr_enum,
> -			    0, 0, adcr_enum_text);
> +static SOC_ENUM_SINGLE_VIRT_DECL(adcr_enum, adcr_enum_text);
>
>   static const struct snd_kcontrol_new right_input_mux =
>   	SOC_DAPM_ENUM_VIRT("Route", adcr_enum);
>
Lars-Peter Clausen Feb. 28, 2014, 7:19 a.m. UTC | #2 
On 02/24/2014 03:28 PM, Philippe Rétornaz wrote:
> Le 23/02/2014 16:10, Lars-Peter Clausen a écrit :
>> For the upcoming consolidation for MUXs and virtual MUXs we need to mark
>> virtual
>> enums as such.
>>
>> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
>
> Tested on mx31moboard, no regression.
>
> Thanks,
>
> Philippe
>

Thanks, I'll add a Tested-by tag from you.
diff mbox

Patch

diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index c605036..ec89b8f 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -408,8 +408,7 @@  static const char * const adcl_enum_text[] = {
 	"MC1L", "RXINL",
 };
 
-static SOC_ENUM_SINGLE_DECL(adcl_enum,
-			    0, 0, adcl_enum_text);
+static SOC_ENUM_SINGLE_VIRT_DECL(adcl_enum, adcl_enum_text);
 
 static const struct snd_kcontrol_new left_input_mux =
 	SOC_DAPM_ENUM_VIRT("Route", adcl_enum);
@@ -418,8 +417,7 @@  static const char * const adcr_enum_text[] = {
 	"MC1R", "MC2", "RXINR", "TXIN",
 };
 
-static SOC_ENUM_SINGLE_DECL(adcr_enum,
-			    0, 0, adcr_enum_text);
+static SOC_ENUM_SINGLE_VIRT_DECL(adcr_enum, adcr_enum_text);
 
 static const struct snd_kcontrol_new right_input_mux =
 	SOC_DAPM_ENUM_VIRT("Route", adcr_enum);