Skip to contentSkip to conversation

ALSA: usb-audio: Use the new macro for HP Dock rename quirks

PATCH In review Takashi Iwai 2 participants 6 messages Jun 8, 2020 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: usb-audio: Use the new macro for HP Dock rename quirks

Replace the open-code with the new QUIRK_DEVICE_PROFILE() macro for simplicity.

Fixes 0c5086f56999 ("ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock")
---
 sound/usb/quirks-table.h | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
sound/usb/quirks-table.h +4 -12
index 90d65bfa733d..4ec491011b19 100644
@@ -43,22 +43,14 @@
 /* HP Thunderbolt Dock Audio Headset */
 {
 	USB_DEVICE(0x03f0, 0x0269),
-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-		.vendor_name = "HP",
-		.product_name = "Thunderbolt Dock Audio Headset",
-		.profile_name = "HP-Thunderbolt-Dock-Audio-Headset",
-		.ifnum = QUIRK_NO_INTERFACE
-	}
+	QUIRK_DEVICE_PROFILE("HP", "Thunderbolt Dock Audio Headset",
+			     "HP-Thunderbolt-Dock-Audio-Headset"),
 },
 /* HP Thunderbolt Dock Audio Module */
 {
 	USB_DEVICE(0x03f0, 0x0567),
-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-		.vendor_name = "HP",
-		.product_name = "Thunderbolt Dock Audio Module",
-		.profile_name = "HP-Thunderbolt-Dock-Audio-Module",
-		.ifnum = QUIRK_NO_INTERFACE
-	}
+	QUIRK_DEVICE_PROFILE("HP", "Thunderbolt Dock Audio Module",
+			     "HP-Thunderbolt-Dock-Audio-Module"),
 },
 /* FTDI devices */
 {
Signature · 1 line
2.16.4
maintainer
#1 lore raw

Dne 08. 06. 20 v 9:15 Takashi Iwai napsal(a):

Quoted 6 lines

Replace the open-code with the new QUIRK_DEVICE_PROFILE() macro for simplicity.

Fixes 0c5086f56999 ("ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock")

---

Takashi, could we export the profile (hint) for new USB cards via the components string - snd_component_add()? The long name seems not appropriate for this. It's a GUI string (which is mangled now).

Jaroslav

Quoted 35 lines
  sound/usb/quirks-table.h | 16 ++++------------
  1 file changed, 4 insertions(+), 12 deletions(-)
sound/usb/quirks-table.h +4 -12
index 90d65bfa733d..4ec491011b19 100644
@@ -43,22 +43,14 @@
  /* HP Thunderbolt Dock Audio Headset */
  {
  	USB_DEVICE(0x03f0, 0x0269),
-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-		.vendor_name = "HP",
-		.product_name = "Thunderbolt Dock Audio Headset",
-		.profile_name = "HP-Thunderbolt-Dock-Audio-Headset",
-		.ifnum = QUIRK_NO_INTERFACE
-	}
+	QUIRK_DEVICE_PROFILE("HP", "Thunderbolt Dock Audio Headset",
+			     "HP-Thunderbolt-Dock-Audio-Headset"),
  },
  /* HP Thunderbolt Dock Audio Module */
  {
  	USB_DEVICE(0x03f0, 0x0567),
-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-		.vendor_name = "HP",
-		.product_name = "Thunderbolt Dock Audio Module",
-		.profile_name = "HP-Thunderbolt-Dock-Audio-Module",
-		.ifnum = QUIRK_NO_INTERFACE
-	}
+	QUIRK_DEVICE_PROFILE("HP", "Thunderbolt Dock Audio Module",
+			     "HP-Thunderbolt-Dock-Audio-Module"),
  },
  /* FTDI devices */
  {
Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
#2 lore raw
Quoted 5 lines · Jaroslav Kysela

Dne 08. 06. 20 v 9:15 Takashi Iwai napsal(a):

Quoted 3 lines

Replace the open-code with the new QUIRK_DEVICE_PROFILE() macro for simplicity.

Quoted 7 lines
Quoted 3 lines
Fixes 0c5086f56999 ("ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock")

---

Takashi, could we export the profile (hint) for new USB cards via the components string - snd_component_add()? The long name seems not appropriate for this. It's a GUI string (which is mangled now).

It's possible, and maybe we should move to it, but we'd need to provide in card->longname for now because the component support in user-space side isn't in major releases yet. The longname is ugly, but that's the only way that works stably right now.

Also, we need a common helper function for adding the component string in the kernel side, too, not specific to USB-audio.

thanks,

Takashi

maintainer
#3 lore raw

Dne 08. 06. 20 v 10:44 Takashi Iwai napsal(a):

Quoted 15 lines
Quoted 5 lines · Jaroslav Kysela

Dne 08. 06. 20 v 9:15 Takashi Iwai napsal(a):

Quoted 3 lines

Replace the open-code with the new QUIRK_DEVICE_PROFILE() macro for simplicity.

Quoted 7 lines
Quoted 3 lines
Fixes 0c5086f56999 ("ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock")

---

Takashi, could we export the profile (hint) for new USB cards via the components string - snd_component_add()? The long name seems not appropriate for this. It's a GUI string (which is mangled now).

Quoted 7 lines

It's possible, and maybe we should move to it, but we'd need to provide in card->longname for now because the component support in user-space side isn't in major releases yet. The longname is ugly, but that's the only way that works stably right now.

Also, we need a common helper function for adding the component string in the kernel side, too, not specific to USB-audio.

There is already snd_component_add() function, so we need to settle only the identification prefix for those "model" strings.

It would be nice to duplicate this info for the moment (the components string should be shorter than used for long name).

Perhaps, we can just add "hw:<hint>" component string for the more finer hardware identification, like:

$ amixer -c 0 info
Components	: 'USB0bda:58fe hw:VideoMic'

Jaroslav

Quoted 6 lines

thanks,

Takashi

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
#4 lore raw
Quoted 22 lines · Jaroslav Kysela

Dne 08. 06. 20 v 10:44 Takashi Iwai napsal(a):

Quoted 20 lines
Quoted 5 lines · Jaroslav Kysela

Dne 08. 06. 20 v 9:15 Takashi Iwai napsal(a):

Quoted 3 lines

Replace the open-code with the new QUIRK_DEVICE_PROFILE() macro for simplicity.

Quoted 7 lines
Quoted 3 lines
Fixes 0c5086f56999 ("ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock")

---

Takashi, could we export the profile (hint) for new USB cards via the components string - snd_component_add()? The long name seems not appropriate for this. It's a GUI string (which is mangled now).

It's possible, and maybe we should move to it, but we'd need to provide in card->longname for now because the component support in user-space side isn't in major releases yet. The longname is ugly, but that's the only way that works stably right now.

Quoted 8 lines
Quoted 2 lines

Also, we need a common helper function for adding the component string in the kernel side, too, not specific to USB-audio.

There is already snd_component_add() function, so we need to settle only the identification prefix for those "model" strings.

It would be nice to duplicate this info for the moment (the components string should be shorter than used for long name).

Yes, what we need a concrete definition. The implementation in kernel-side must be easy :)

Quoted 5 lines

Perhaps, we can just add "hw:<hint>" component string for the more finer hardware identification, like:

$ amixer -c 0 info
Components	: 'USB0bda:58fe hw:VideoMic'

I don't mind what form, but would the example above work as a UCM profile properly?

thanks,

Takashi

maintainer
#5 lore raw

Dne 08. 06. 20 v 11:22 Takashi Iwai napsal(a):

Quoted 36 lines
Quoted 22 lines · Jaroslav Kysela

Dne 08. 06. 20 v 10:44 Takashi Iwai napsal(a):

Quoted 20 lines
Quoted 5 lines · Jaroslav Kysela

Dne 08. 06. 20 v 9:15 Takashi Iwai napsal(a):

Quoted 3 lines

Replace the open-code with the new QUIRK_DEVICE_PROFILE() macro for simplicity.

Quoted 7 lines
Quoted 3 lines
Fixes 0c5086f56999 ("ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock")

---

Takashi, could we export the profile (hint) for new USB cards via the components string - snd_component_add()? The long name seems not appropriate for this. It's a GUI string (which is mangled now).

It's possible, and maybe we should move to it, but we'd need to provide in card->longname for now because the component support in user-space side isn't in major releases yet. The longname is ugly, but that's the only way that works stably right now.

Quoted 8 lines
Quoted 2 lines

Also, we need a common helper function for adding the component string in the kernel side, too, not specific to USB-audio.

There is already snd_component_add() function, so we need to settle only the identification prefix for those "model" strings.

It would be nice to duplicate this info for the moment (the components string should be shorter than used for long name).

Yes, what we need a concrete definition. The implementation in kernel-side must be easy :)

Quoted 8 lines
Quoted 5 lines

Perhaps, we can just add "hw:<hint>" component string for the more finer hardware identification, like:

$ amixer -c 0 info
Components	: 'USB0bda:58fe hw:VideoMic'

I don't mind what form, but would the example above work as a UCM profile properly?

It should work for UCM2. UCM2 can compare the components string and load or use the appropriate piece of configuration. So it means that ucm2/USB-Audio/USB-Audio.conf will handle this.

I also added the possibility to extract 'VideoMic' (regex) from the 'hw:VideoMic' string and include the file from the custom path (syntax 3 in UCM2). So we can end with the ucm2/USB-Audio/HiFi-VideoMic.conf file.

So basically, the prefix may be driver specific but consistent, so we can do a match against it in the user space. Or we may use 'hint:<hwid>' or so.

Jaroslav

Quoted 6 lines

thanks,

Takashi

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.