All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Geoffrey D. Bennett" <g@b4.vu>
To: alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.de>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>,
	Vladimir Sadovnikov <sadko4u@gmail.com>
Subject: [PATCH 1/4] ALSA: scarlett2: Fix Mute/Dim/MSD Mode control names
Date: Fri, 23 Jul 2021 05:41:53 +0930	[thread overview]
Message-ID: <77f1000652c37e3217fb8dad8e156bc6392abc0b.1626959758.git.g@b4.vu> (raw)
In-Reply-To: <cover.1626959758.git.g@b4.vu>

Append "Playback Switch" to the names of "Mute" and "Dim" controls,
and append "Switch" to the "MSD Mode" control as per
Documentation/sound/designs/control-names.rst.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
---
 sound/usb/mixer_scarlett_gen2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index f9d698a37153..347995ea39e4 100644
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -228,7 +228,7 @@ enum {
 };
 
 static const char *const scarlett2_dim_mute_names[SCARLETT2_DIM_MUTE_COUNT] = {
-	"Mute", "Dim"
+	"Mute Playback Switch", "Dim Playback Switch"
 };
 
 /* Description of each hardware port type:
@@ -3455,7 +3455,7 @@ static int scarlett2_add_msd_ctl(struct usb_mixer_interface *mixer)
 
 	/* Add MSD control */
 	return scarlett2_add_new_ctl(mixer, &scarlett2_msd_ctl,
-				     0, 1, "MSD Mode", NULL);
+				     0, 1, "MSD Mode Switch", NULL);
 }
 
 /*** Cleanup/Suspend Callbacks ***/
-- 
2.31.1


  parent reply	other threads:[~2021-07-22 20:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-22 20:11 [PATCH 0/4] ALSA: scarlett2: note gen 3 support + fix four issues Geoffrey D. Bennett
2021-07-22 18:30 ` Geraldo Nascimento
2021-07-22 20:11 ` Geoffrey D. Bennett [this message]
2021-07-22 20:12 ` [PATCH 2/4] ALSA: scarlett2: Fix Direct Monitor control name for 2i2 Geoffrey D. Bennett
2021-07-22 20:12 ` [PATCH 3/4] ALSA: scarlett2: Correct channel mute status after mute button pressed Geoffrey D. Bennett
2021-07-22 20:13 ` [PATCH 4/4] ALSA: scarlett2: Fix line out/speaker switching notifications Geoffrey D. Bennett
2021-07-24  8:06 ` [PATCH 0/4] ALSA: scarlett2: note gen 3 support + fix four issues Takashi Iwai

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=77f1000652c37e3217fb8dad8e156bc6392abc0b.1626959758.git.g@b4.vu \
    --to=g@b4.vu \
    --cc=alsa-devel@alsa-project.org \
    --cc=htl10@users.sourceforge.net \
    --cc=sadko4u@gmail.com \
    --cc=tiwai@suse.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.