diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-09-26 04:03:09 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:16:39 -0500 |
commit | 3527a008cbc51dd23a8bf4927e3ab29423b0d05b (patch) | |
tree | b5aaab3e8800a3d333e8639f7b4fa59d460fb804 /sound/usb/usbmidi.c | |
parent | 3cfc1eb181b49dfbfeaf20ebfeb5cd2af4c4c4b5 (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/usbmidi.c')
-rw-r--r-- | sound/usb/usbmidi.c | 14 |
1 files changed, 6 insertions, 8 deletions
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); |