aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-09-26 04:03:09 -0400
committerJaroslav Kysela <perex@suse.cz>2005-11-04 07:16:39 -0500
commit3527a008cbc51dd23a8bf4927e3ab29423b0d05b (patch)
treeb5aaab3e8800a3d333e8639f7b4fa59d460fb804 /sound/usb
parent3cfc1eb181b49dfbfeaf20ebfeb5cd2af4c4c4b5 (diff)
[ALSA] usb-audio: remove old compatibility wrappers (2/2)
Modules: USB generic driver Move the usb_complete_callback() compatibility wrapper out of the kernel tree. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c4
-rw-r--r--sound/usb/usbaudio.h4
-rw-r--r--sound/usb/usbmidi.c14
3 files changed, 8 insertions, 14 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index ea1b1f87c1b6..5429b169877a 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -1044,7 +1044,7 @@ static int init_substream_urbs(snd_usb_substream_t *subs, unsigned int period_by
1044 u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; 1044 u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
1045 u->urb->interval = 1 << subs->datainterval; 1045 u->urb->interval = 1 << subs->datainterval;
1046 u->urb->context = u; 1046 u->urb->context = u;
1047 u->urb->complete = snd_usb_complete_callback(snd_complete_urb); 1047 u->urb->complete = snd_complete_urb;
1048 } 1048 }
1049 1049
1050 if (subs->syncpipe) { 1050 if (subs->syncpipe) {
@@ -1070,7 +1070,7 @@ static int init_substream_urbs(snd_usb_substream_t *subs, unsigned int period_by
1070 u->urb->number_of_packets = 1; 1070 u->urb->number_of_packets = 1;
1071 u->urb->interval = 1 << subs->syncinterval; 1071 u->urb->interval = 1 << subs->syncinterval;
1072 u->urb->context = u; 1072 u->urb->context = u;
1073 u->urb->complete = snd_usb_complete_callback(snd_complete_sync_urb); 1073 u->urb->complete = snd_complete_sync_urb;
1074 } 1074 }
1075 } 1075 }
1076 return 0; 1076 return 0;
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index b58dc0ca7d38..b5802022bb19 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -249,10 +249,6 @@ void snd_usbmidi_disconnect(struct list_head *p);
249#define get_cfg_desc(cfg) (&(cfg)->desc) 249#define get_cfg_desc(cfg) (&(cfg)->desc)
250#endif 250#endif
251 251
252#ifndef snd_usb_complete_callback
253#define snd_usb_complete_callback(x) (x)
254#endif
255
256#ifndef snd_usb_get_speed 252#ifndef snd_usb_get_speed
257#define snd_usb_get_speed(dev) ((dev)->speed) 253#define snd_usb_get_speed(dev) ((dev)->speed)
258#endif 254#endif
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 369319d672b6..2885b8974daa 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -861,13 +861,12 @@ static int snd_usbmidi_in_endpoint_create(snd_usb_midi_t* umidi,
861 return -ENOMEM; 861 return -ENOMEM;
862 } 862 }
863 if (ep_info->in_interval) 863 if (ep_info->in_interval)
864 usb_fill_int_urb(ep->urb, umidi->chip->dev, pipe, buffer, length, 864 usb_fill_int_urb(ep->urb, umidi->chip->dev, pipe, buffer,
865 snd_usb_complete_callback(snd_usbmidi_in_urb_complete), 865 length, snd_usbmidi_in_urb_complete, ep,
866 ep, ep_info->in_interval); 866 ep_info->in_interval);
867 else 867 else
868 usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer, length, 868 usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer,
869 snd_usb_complete_callback(snd_usbmidi_in_urb_complete), 869 length, snd_usbmidi_in_urb_complete, ep);
870 ep);
871 ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; 870 ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
872 871
873 rep->in = ep; 872 rep->in = ep;
@@ -931,8 +930,7 @@ static int snd_usbmidi_out_endpoint_create(snd_usb_midi_t* umidi,
931 return -ENOMEM; 930 return -ENOMEM;
932 } 931 }
933 usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer, 932 usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer,
934 ep->max_transfer, 933 ep->max_transfer, snd_usbmidi_out_urb_complete, ep);
935 snd_usb_complete_callback(snd_usbmidi_out_urb_complete), ep);
936 ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; 934 ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
937 935
938 spin_lock_init(&ep->buffer_lock); 936 spin_lock_init(&ep->buffer_lock);