diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2005-09-26 10:03:09 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 13:16:39 +0100 |
| commit | 3527a008cbc51dd23a8bf4927e3ab29423b0d05b (patch) | |
| tree | b5aaab3e8800a3d333e8639f7b4fa59d460fb804 /sound/usb | |
| parent | 3cfc1eb181b49dfbfeaf20ebfeb5cd2af4c4c4b5 (diff) | |
| download | lwn-3527a008cbc51dd23a8bf4927e3ab29423b0d05b.tar.gz lwn-3527a008cbc51dd23a8bf4927e3ab29423b0d05b.zip | |
[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.c | 4 | ||||
| -rw-r--r-- | sound/usb/usbaudio.h | 4 | ||||
| -rw-r--r-- | sound/usb/usbmidi.c | 14 |
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 u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; u->urb->interval = 1 << subs->datainterval; u->urb->context = u; - u->urb->complete = snd_usb_complete_callback(snd_complete_urb); + u->urb->complete = snd_complete_urb; } if (subs->syncpipe) { @@ -1070,7 +1070,7 @@ static int init_substream_urbs(snd_usb_substream_t *subs, unsigned int period_by u->urb->number_of_packets = 1; u->urb->interval = 1 << subs->syncinterval; u->urb->context = u; - u->urb->complete = snd_usb_complete_callback(snd_complete_sync_urb); + u->urb->complete = snd_complete_sync_urb; } } 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); #define get_cfg_desc(cfg) (&(cfg)->desc) #endif -#ifndef snd_usb_complete_callback -#define snd_usb_complete_callback(x) (x) -#endif - #ifndef snd_usb_get_speed #define snd_usb_get_speed(dev) ((dev)->speed) #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, return -ENOMEM; } if (ep_info->in_interval) - usb_fill_int_urb(ep->urb, umidi->chip->dev, pipe, buffer, length, - snd_usb_complete_callback(snd_usbmidi_in_urb_complete), - ep, ep_info->in_interval); + usb_fill_int_urb(ep->urb, umidi->chip->dev, pipe, buffer, + length, snd_usbmidi_in_urb_complete, ep, + ep_info->in_interval); else - usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer, length, - snd_usb_complete_callback(snd_usbmidi_in_urb_complete), - ep); + usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer, + length, snd_usbmidi_in_urb_complete, ep); ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; rep->in = ep; @@ -931,8 +930,7 @@ static int snd_usbmidi_out_endpoint_create(snd_usb_midi_t* umidi, return -ENOMEM; } usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer, - ep->max_transfer, - snd_usb_complete_callback(snd_usbmidi_out_urb_complete), ep); + ep->max_transfer, snd_usbmidi_out_urb_complete, ep); ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; spin_lock_init(&ep->buffer_lock); |