redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Greg Kroah-Hartman 2009-02-27 20:28:04 -08:00
parent 77491e524c
commit 0c7ab1580f
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/line6/capture.c
View File

@ -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;

10
drivers/staging/line6/config.h
View File

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

6
drivers/staging/line6/driver.c
View File

@ -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;

2
drivers/staging/line6/midi.c
View File

@ -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;

2
drivers/staging/line6/playback.c
View File

@ -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;