Commit 0c7ab158 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 77491e52
...@@ -136,7 +136,7 @@ void unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm) ...@@ -136,7 +136,7 @@ void unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm)
/* /*
Callback for completed capture URB. 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 i, index, length = 0, shutdown = 0;
int frames; int frames;
......
...@@ -43,16 +43,6 @@ ...@@ -43,16 +43,6 @@
#define CHECKPOINT printk("line6usb: %s (%s:%d)\n", __FUNCTION__, __FILE__, __LINE__) #define CHECKPOINT printk("line6usb: %s (%s:%d)\n", __FUNCTION__, __FILE__, __LINE__)
#endif #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 #if DO_DEBUG_MESSAGES
#define DEBUG_MESSAGES(x) (x) #define DEBUG_MESSAGES(x) (x)
#else #else
......
...@@ -94,7 +94,7 @@ struct message ...@@ -94,7 +94,7 @@ struct message
/* /*
Forward declarations. 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); 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 ...@@ -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. 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; 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 ...@@ -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. 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 usb_line6 *line6 = (struct usb_line6 *)urb->context;
struct MidiBuffer *mb = &line6->line6midi->midibuf_in; struct MidiBuffer *mb = &line6->line6midi->midibuf_in;
......
...@@ -87,7 +87,7 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream) ...@@ -87,7 +87,7 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream)
/* /*
Notification of completion of MIDI transmission. 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; unsigned long flags;
int status; int status;
......
...@@ -221,7 +221,7 @@ void unlink_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm) ...@@ -221,7 +221,7 @@ void unlink_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm)
/* /*
Callback for completed playback URB. 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; int i, index, length = 0, shutdown = 0;
unsigned long flags; unsigned long flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment