ALSA: usb-audio: rename QUIRK_FLAG_MIXER_MIN_MUTE to QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE

As a preparation of introduction QUIRK_FLAG_MIXER_CAPTURE_MIN_MUTE

Also make it printing an info while applying

Signed-off-by: Cryolitia PukNgae <cryolitia@uniontech.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250903-sound-v1-1-d4ca777b8512@uniontech.com

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index b8275c81802e60314ee483a31a0fcb7306b24c76..2a1abc24dbfc0c6b69d64529eda01bc25f1a6dd1 100644 (file)
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -4543,9 +4543,12 @@ void snd_usb_mixer_fu_apply_quirk(struct usb_mixer_interface *mixer,
        }
 
        /* lowest playback value is muted on some devices */
-       if (mixer->chip->quirk_flags & QUIRK_FLAG_MIXER_MIN_MUTE)
-               if (strstr(kctl->id.name, "Playback"))
+       if (mixer->chip->quirk_flags & QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE)
+               if (strstr(kctl->id.name, "Playback")) {
+                       usb_audio_info(mixer->chip,
+                                      "applying playback min mute quirk\n");
                        cval->min_mute = 1;
+               }
 
        /* ALSA-ify some Plantronics headset control names */
        if (USB_ID_VENDOR(mixer->chip->usb_id) == 0x047f &&

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 766db7d00cbc95984afa834200ebe3adfdf182ef..0fe31af3158f08a39849f8df99dbbfb10c5fdcc1 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -2200,9 +2200,9 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
        DEVICE_FLG(0x0556, 0x0014, /* Phoenix Audio TMX320VC */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x0572, 0x1b08, /* Conexant Systems (Rockwell), Inc. */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x0572, 0x1b09, /* Conexant Systems (Rockwell), Inc. */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x05a3, 0x9420, /* ELP HD USB Camera */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x05a7, 0x1020, /* Bose Companion 5 */
@@ -2246,15 +2246,15 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
        DEVICE_FLG(0x0b0e, 0x0349, /* Jabra 550a */
                   QUIRK_FLAG_CTL_MSG_DELAY_1M),
        DEVICE_FLG(0x0bda, 0x498a, /* Realtek Semiconductor Corp. */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x0c45, 0x6340, /* Sonix HD USB Camera */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x0c45, 0x636b, /* Microdia JP001 USB Camera */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x0d8c, 0x000c, /* C-Media */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x0d8c, 0x0014, /* C-Media */
-                  QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
                   QUIRK_FLAG_FIXED_RATE),
        DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
@@ -2264,7 +2264,7 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
        DEVICE_FLG(0x1101, 0x0003, /* Audioengine D1 */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x12d1, 0x3a07, /* Huawei Technologies Co., Ltd. */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
                   QUIRK_FLAG_GET_SAMPLE_RATE | QUIRK_FLAG_MIC_RES_16),
        DEVICE_FLG(0x1395, 0x740a, /* Sennheiser DECT */
@@ -2304,7 +2304,7 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
        DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x19f7, 0x0003, /* RODE NT-USB */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x1bcf, 0x2281, /* HD Webcam */
@@ -2356,7 +2356,7 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
        DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x2a70, 0x1881, /* OnePlus Technology (Shenzhen) Co., Ltd. BE02T */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */
                   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
        DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */
@@ -2368,13 +2368,13 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
        DEVICE_FLG(0x2d95, 0x8021, /* VIVO USB-C-XE710 HEADSET */
                   QUIRK_FLAG_CTL_MSG_DELAY_1M),
        DEVICE_FLG(0x2d99, 0x0026, /* HECATE G2 GAMING HEADSET */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x2fc6, 0xf0b7, /* iBasso DC07 Pro */
                   QUIRK_FLAG_CTL_MSG_DELAY_1M),
        DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */
                   QUIRK_FLAG_IGNORE_CTL_ERROR),
        DEVICE_FLG(0x339b, 0x3a07, /* Synaptics HONOR USB-C HEADSET */
-                  QUIRK_FLAG_MIXER_MIN_MUTE),
+                  QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE),
        DEVICE_FLG(0x413c, 0xa506, /* Dell AE515 sound bar */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
        DEVICE_FLG(0x534d, 0x0021, /* MacroSilicon MS2100/MS2106 */

diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 59335b94103004b900285e4990b971d74bf37532..707b3037b1b3a3d2997157154cf78d71455bfe4b 100644 (file)
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -219,7 +219,7 @@ extern bool snd_usb_skip_validation;
  *  for the given endpoint.
  * QUIRK_FLAG_MIC_RES_16 and QUIRK_FLAG_MIC_RES_384
  *  Set the fixed resolution for Mic Capture Volume (mostly for webcams)
- * QUIRK_FLAG_MIXER_MIN_MUTE
+ * QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE
  *  Set minimum volume control value as mute for devices where the lowest
  *  playback value represents muted state instead of minimum audible volume
  */
@@ -248,6 +248,6 @@ extern bool snd_usb_skip_validation;
 #define QUIRK_FLAG_FIXED_RATE          (1U << 21)
 #define QUIRK_FLAG_MIC_RES_16          (1U << 22)
 #define QUIRK_FLAG_MIC_RES_384         (1U << 23)
-#define QUIRK_FLAG_MIXER_MIN_MUTE      (1U << 24)
+#define QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE     (1U << 24)
 
 #endif /* __USBAUDIO_H */