Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee733397 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] usb-audio - remove superfluous parameter 



USB generic driver,USB USX2Y
This patch removes the superfluous driver parameter from the
disconnect functions.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent 8e062ec7

sound/usb/usbaudio.c

+3 −3
Original line number Diff line number Diff line
@@ -2588,7 +2588,7 @@ static int parse_audio_endpoints(snd_usb_audio_t *chip, int iface_no) 
 * disconnect streams

 * called from snd_usb_audio_disconnect()

 */

static void snd_usb_stream_disconnect(struct list_head *head, struct usb_driver *driver)

static void snd_usb_stream_disconnect(struct list_head *head)

{

	int idx;

	snd_usb_stream_t *as;
@@ -3282,11 +3282,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr) 
		snd_card_disconnect(card);

		/* release the pcm resources */

		list_for_each(p, &chip->pcm_list) {

			snd_usb_stream_disconnect(p, &usb_audio_driver);

			snd_usb_stream_disconnect(p);

		}

		/* release the midi resources */

		list_for_each(p, &chip->midi_list) {

			snd_usbmidi_disconnect(p, &usb_audio_driver);

			snd_usbmidi_disconnect(p);

		}

		usb_chip[chip->index] = NULL;

		up(&register_mutex);

sound/usb/usbaudio.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif); 
int snd_usb_create_midi_interface(snd_usb_audio_t *chip, struct usb_interface *iface, const snd_usb_audio_quirk_t *quirk);

void snd_usbmidi_input_stop(struct list_head* p);

void snd_usbmidi_input_start(struct list_head* p);

void snd_usbmidi_disconnect(struct list_head *p, struct usb_driver *driver);

void snd_usbmidi_disconnect(struct list_head *p);



/*

 * retrieve usb_interface descriptor from the host interface

sound/usb/usbmidi.c

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static void snd_usbmidi_free(snd_usb_midi_t* umidi) 
/*

 * Unlinks all URBs (must be done before the usb_device is deleted).

 */

void snd_usbmidi_disconnect(struct list_head* p, struct usb_driver *driver)

void snd_usbmidi_disconnect(struct list_head* p)

{

	snd_usb_midi_t* umidi;

	int i;

sound/usb/usx2y/usbusx2y.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static void usX2Y_usb_disconnect(struct usb_device* device, void* ptr) 
		snd_card_disconnect((snd_card_t*)ptr);

		/* release the midi resources */

		list_for_each(p, &usX2Y->chip.midi_list) {

			snd_usbmidi_disconnect(p, &snd_usX2Y_usb_driver);

			snd_usbmidi_disconnect(p);

		}

		if (usX2Y->us428ctls_sharedmem) 

			wake_up(&usX2Y->us428ctls_wait_queue_head);