aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-09-26 04:01:12 -0400
committerJaroslav Kysela <perex@suse.cz>2005-11-04 07:16:37 -0500
commit3cfc1eb181b49dfbfeaf20ebfeb5cd2af4c4c4b5 (patch)
treec29cd9f00e5877bf138449dad9f770b2fc30231c /sound
parentd879f0ccf55a9ac5752b24dc210a446746e3c6da (diff)
[ALSA] usb-audio: remove old compatibility wrappers (1/2)
Modules: USB generic driver Move the usb_pipe_needs_resubmit() compatibility wrapper out of the kernel tree. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/usbaudio.h4
-rw-r--r--sound/usb/usbmidi.c6
2 files changed, 2 insertions, 8 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index ad9eab211d8f..b58dc0ca7d38 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 usb_pipe_needs_resubmit
253#define usb_pipe_needs_resubmit(pipe) 1
254#endif
255
256#ifndef snd_usb_complete_callback 252#ifndef snd_usb_complete_callback
257#define snd_usb_complete_callback(x) (x) 253#define snd_usb_complete_callback(x) (x)
258#endif 254#endif
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 32be9f99c023..369319d672b6 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -246,10 +246,8 @@ static void snd_usbmidi_in_urb_complete(struct urb* urb, struct pt_regs *regs)
246 } 246 }
247 } 247 }
248 248
249 if (usb_pipe_needs_resubmit(urb->pipe)) { 249 urb->dev = ep->umidi->chip->dev;
250 urb->dev = ep->umidi->chip->dev; 250 snd_usbmidi_submit_urb(urb, GFP_ATOMIC);
251 snd_usbmidi_submit_urb(urb, GFP_ATOMIC);
252 }
253} 251}
254 252
255static void snd_usbmidi_out_urb_complete(struct urb* urb, struct pt_regs *regs) 253static void snd_usbmidi_out_urb_complete(struct urb* urb, struct pt_regs *regs)