ALSA: usb-audio: Manage number of rawmidis globally

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

We're going to create rawmidi objects for MIDI 2.0 in a different code
from the current code for USB-MIDI 1.0. As a preliminary work, this
patch adds the number of rawmidi objects to keep globally in a
USB-audio card instance, so that it can be referred from both MIDI 1.0
and 2.0 code.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230523075358.9672-8-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai 2 years ago bb1bf4fa fa030f66

+16 -7

5 changed files

expand all

sound

usb

card.c

midi.c

midi.h

quirks.c

usbaudio.h

+3 -2

sound/usb/card.c

··· 179 179 altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC) && 180 180 altsd->bInterfaceSubClass == USB_SUBCLASS_MIDISTREAMING) { 181 181 int err = __snd_usbmidi_create(chip->card, iface, 182 - &chip->midi_list, NULL, 183 - chip->usb_id); 182 + &chip->midi_list, NULL, 183 + chip->usb_id, 184 + &chip->num_rawmidis); 184 185 if (err < 0) { 185 186 dev_err(&dev->dev, 186 187 "%u:%d: cannot create sequencer device\n",

+6 -1

sound/usb/midi.c

··· 2461 2461 struct usb_interface *iface, 2462 2462 struct list_head *midi_list, 2463 2463 const struct snd_usb_audio_quirk *quirk, 2464 - unsigned int usb_id) 2464 + unsigned int usb_id, 2465 + unsigned int *num_rawmidis) 2465 2466 { 2466 2467 struct snd_usb_midi *umidi; 2467 2468 struct snd_usb_midi_endpoint_info endpoints[MIDI_MAX_ENDPOINTS]; ··· 2477 2476 umidi->iface = iface; 2478 2477 umidi->quirk = quirk; 2479 2478 umidi->usb_protocol_ops = &snd_usbmidi_standard_ops; 2479 + if (num_rawmidis) 2480 + umidi->next_midi_device = *num_rawmidis; 2480 2481 spin_lock_init(&umidi->disc_lock); 2481 2482 init_rwsem(&umidi->disc_rwsem); 2482 2483 mutex_init(&umidi->mutex); ··· 2598 2595 usb_autopm_get_interface_no_resume(umidi->iface); 2599 2596 2600 2597 list_add_tail(&umidi->list, midi_list); 2598 + if (num_rawmidis) 2599 + *num_rawmidis = umidi->next_midi_device; 2601 2600 return 0; 2602 2601 2603 2602 free_midi:

+3 -2

sound/usb/midi.h

··· 46 46 struct usb_interface *iface, 47 47 struct list_head *midi_list, 48 48 const struct snd_usb_audio_quirk *quirk, 49 - unsigned int usb_id); 49 + unsigned int usb_id, 50 + unsigned int *num_rawmidis); 50 51 51 52 static inline int snd_usbmidi_create(struct snd_card *card, 52 53 struct usb_interface *iface, 53 54 struct list_head *midi_list, 54 55 const struct snd_usb_audio_quirk *quirk) 55 56 { 56 - return __snd_usbmidi_create(card, iface, midi_list, quirk, 0); 57 + return __snd_usbmidi_create(card, iface, midi_list, quirk, 0, NULL); 57 58 } 58 59 59 60 void snd_usbmidi_input_stop(struct list_head *p);

+3 -2

sound/usb/quirks.c

··· 436 436 chip->usb_id == USB_ID(0x0582, 0x002b) 437 437 ? &ua700_quirk : &uaxx_quirk; 438 438 return __snd_usbmidi_create(chip->card, iface, 439 - &chip->midi_list, quirk, 440 - chip->usb_id); 439 + &chip->midi_list, quirk, 440 + chip->usb_id, 441 + &chip->num_rawmidis); 441 442 } 442 443 443 444 if (altsd->bNumEndpoints != 1)

sound/usb/usbaudio.h

··· 49 49 struct list_head clock_ref_list; /* list of clock refcounts */ 50 50 int pcm_devs; 51 51 52 + unsigned int num_rawmidis; /* number of created rawmidi devices */ 52 53 struct list_head midi_list; /* list of midi interfaces */ 53 54 54 55 struct list_head mixer_list; /* list of mixer interfaces */