Staging: line6: remove PT_REGS

As the code is in the kernel tree, it's no longer needed.

Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index 5dec3bfff04d4ae48bef130278931485b915c0e0..96ed08a06b998c48b5753366cc34e78b18df3175 100644 (file)
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -136,7 +136,7 @@ void unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm)
 /*
        Callback for completed capture URB.
 */
-static void audio_in_callback(struct urb *urb PT_REGS)
+static void audio_in_callback(struct urb *urb)
 {
        int i, index, length = 0, shutdown = 0;
        int frames;

diff --git a/drivers/staging/line6/config.h b/drivers/staging/line6/config.h
index a687dc9b579fd0fb0387ab584d828acc19f274e4..205e697fa90c20e04335d68f76af247b4d5718c8 100644 (file)
--- a/drivers/staging/line6/config.h
+++ b/drivers/staging/line6/config.h
@@ -43,16 +43,6 @@
 #define CHECKPOINT printk("line6usb: %s (%s:%d)\n", __FUNCTION__, __FILE__, __LINE__)
 #endif
 
-/**
-   In Linux 2.6.20 and later, the pt_regs is no longer passed to USB callback
-   functions.
-*/
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-#define PT_REGS
-#else
-#define PT_REGS , struct pt_regs *regs
-#endif
-
 #if DO_DEBUG_MESSAGES
 #define DEBUG_MESSAGES(x) (x)
 #else

diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index a5a1c07e6a01d174d80b395f0d1838acc2ad4b59..7c20783b3e583edab68137ed2e74c3e87c6ad6bb 100644 (file)
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -94,7 +94,7 @@ struct message
 /*
        Forward declarations.
 */
-static void line6_data_received(struct urb *urb PT_REGS);
+static void line6_data_received(struct urb *urb);
 static int line6_send_raw_message_async_part(struct message *msg, struct urb *urb);
 
 
@@ -202,7 +202,7 @@ int line6_send_raw_message(struct usb_line6 *line6, const char *buffer, int size
 /*
        Notification of completion of asynchronous request transmission.
 */
-static void line6_async_request_sent(struct urb *urb PT_REGS)
+static void line6_async_request_sent(struct urb *urb)
 {
        struct message *msg = (struct message *)urb->context;
 
@@ -315,7 +315,7 @@ char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, int code2, in
 /*
        Notification of data received from the Line6 device.
 */
-static void line6_data_received(struct urb *urb PT_REGS)
+static void line6_data_received(struct urb *urb)
 {
        struct usb_line6 *line6 = (struct usb_line6 *)urb->context;
        struct MidiBuffer *mb = &line6->line6midi->midibuf_in;

diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index b6fea1670f94c508ac3d5542bfe738be7ff9ee41..f72681963e4430f769d4ef1e11f1526857df63c1 100644 (file)
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -87,7 +87,7 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream)
 /*
        Notification of completion of MIDI transmission.
 */
-static void midi_sent(struct urb *urb PT_REGS)
+static void midi_sent(struct urb *urb)
 {
        unsigned long flags;
        int status;

diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index f6503c23bd08c5f84943703a55b9dd5ecf8cf4f0..4e36f250d4be26237f794b995f8ce23bbec663ea 100644 (file)
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -221,7 +221,7 @@ void unlink_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm)
 /*
        Callback for completed playback URB.
 */
-static void audio_out_callback(struct urb *urb PT_REGS)
+static void audio_out_callback(struct urb *urb)
 {
        int i, index, length = 0, shutdown = 0;
        unsigned long flags;