aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-04-25 04:34:13 -0400
committerJaroslav Kysela <perex@suse.cz>2005-05-29 04:05:14 -0400
commitee7333970bee3e7565feeb3edfef4db81cbe72e5 (patch)
tree418eb84e58d8d6f85ceafffc03fe37119728987d /sound/usb
parent8e062ec7108f8a91149e6bccddc3b7341e406274 (diff)
[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: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c6
-rw-r--r--sound/usb/usbaudio.h2
-rw-r--r--sound/usb/usbmidi.c2
-rw-r--r--sound/usb/usx2y/usbusx2y.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index a7183c5876b3..08c5efcf5be2 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2588,7 +2588,7 @@ static int parse_audio_endpoints(snd_usb_audio_t *chip, int iface_no)
2588 * disconnect streams 2588 * disconnect streams
2589 * called from snd_usb_audio_disconnect() 2589 * called from snd_usb_audio_disconnect()
2590 */ 2590 */
2591static void snd_usb_stream_disconnect(struct list_head *head, struct usb_driver *driver) 2591static void snd_usb_stream_disconnect(struct list_head *head)
2592{ 2592{
2593 int idx; 2593 int idx;
2594 snd_usb_stream_t *as; 2594 snd_usb_stream_t *as;
@@ -3282,11 +3282,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr)
3282 snd_card_disconnect(card); 3282 snd_card_disconnect(card);
3283 /* release the pcm resources */ 3283 /* release the pcm resources */
3284 list_for_each(p, &chip->pcm_list) { 3284 list_for_each(p, &chip->pcm_list) {
3285 snd_usb_stream_disconnect(p, &usb_audio_driver); 3285 snd_usb_stream_disconnect(p);
3286 } 3286 }
3287 /* release the midi resources */ 3287 /* release the midi resources */
3288 list_for_each(p, &chip->midi_list) { 3288 list_for_each(p, &chip->midi_list) {
3289 snd_usbmidi_disconnect(p, &usb_audio_driver); 3289 snd_usbmidi_disconnect(p);
3290 } 3290 }
3291 usb_chip[chip->index] = NULL; 3291 usb_chip[chip->index] = NULL;
3292 up(&register_mutex); 3292 up(&register_mutex);
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index eecbf19fcb6f..14f7cf7e363c 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -223,7 +223,7 @@ int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif);
223int snd_usb_create_midi_interface(snd_usb_audio_t *chip, struct usb_interface *iface, const snd_usb_audio_quirk_t *quirk); 223int snd_usb_create_midi_interface(snd_usb_audio_t *chip, struct usb_interface *iface, const snd_usb_audio_quirk_t *quirk);
224void snd_usbmidi_input_stop(struct list_head* p); 224void snd_usbmidi_input_stop(struct list_head* p);
225void snd_usbmidi_input_start(struct list_head* p); 225void snd_usbmidi_input_start(struct list_head* p);
226void snd_usbmidi_disconnect(struct list_head *p, struct usb_driver *driver); 226void snd_usbmidi_disconnect(struct list_head *p);
227 227
228/* 228/*
229 * retrieve usb_interface descriptor from the host interface 229 * retrieve usb_interface descriptor from the host interface
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 600d990ddc90..304a13451ec9 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -912,7 +912,7 @@ static void snd_usbmidi_free(snd_usb_midi_t* umidi)
912/* 912/*
913 * Unlinks all URBs (must be done before the usb_device is deleted). 913 * Unlinks all URBs (must be done before the usb_device is deleted).
914 */ 914 */
915void snd_usbmidi_disconnect(struct list_head* p, struct usb_driver *driver) 915void snd_usbmidi_disconnect(struct list_head* p)
916{ 916{
917 snd_usb_midi_t* umidi; 917 snd_usb_midi_t* umidi;
918 int i; 918 int i;
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 89ee8b732013..e6e6da159671 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -442,7 +442,7 @@ static void usX2Y_usb_disconnect(struct usb_device* device, void* ptr)
442 snd_card_disconnect((snd_card_t*)ptr); 442 snd_card_disconnect((snd_card_t*)ptr);
443 /* release the midi resources */ 443 /* release the midi resources */
444 list_for_each(p, &usX2Y->chip.midi_list) { 444 list_for_each(p, &usX2Y->chip.midi_list) {
445 snd_usbmidi_disconnect(p, &snd_usX2Y_usb_driver); 445 snd_usbmidi_disconnect(p);
446 } 446 }
447 if (usX2Y->us428ctls_sharedmem) 447 if (usX2Y->us428ctls_sharedmem)
448 wake_up(&usX2Y->us428ctls_wait_queue_head); 448 wake_up(&usX2Y->us428ctls_wait_queue_head);