From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 26 Sep 2005 08:01:12 +0000 (+0200)
Subject: [ALSA] usb-audio: remove old compatibility wrappers (1/2)
X-Git-Tag: v2.6.15-rc1~451^2~71
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=3cfc1eb181b49dfbfeaf20ebfeb5cd2af4c4c4b5;p=safe%2Fjmp%2Flinux-2.6

[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>
---

diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index ad9eab2..b58dc0c 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 usb_pipe_needs_resubmit
-#define usb_pipe_needs_resubmit(pipe) 1
-#endif
-
 #ifndef snd_usb_complete_callback
 #define snd_usb_complete_callback(x) (x)
 #endif
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 32be9f9..369319d 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)
 		}
 	}
 
-	if (usb_pipe_needs_resubmit(urb->pipe)) {
-		urb->dev = ep->umidi->chip->dev;
-		snd_usbmidi_submit_urb(urb, GFP_ATOMIC);
-	}
+	urb->dev = ep->umidi->chip->dev;
+	snd_usbmidi_submit_urb(urb, GFP_ATOMIC);
 }
 
 static void snd_usbmidi_out_urb_complete(struct urb* urb, struct pt_regs *regs)