lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: otus: fix urb callback function type

Browse Source 
The #ifdef for version checking is wrong, and we no longer
pass the struct pt_regs to the urb callback functions.  This
patch fixes this error.

Cc: Luis Rodriguez <Luis.Rodriguez@Atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2008-11-13 15:35:52 -08:00
parent 063e95c736
commit 707eefb8ee
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/otus/wwrap.c
View File

@@ -259,11 +259,7 @@ u32_t zfLnxPutUsbRxBuffer(zdev_t *dev, zbuf_t *buf)
return 0; return 0;
} }
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
void zfLnxUsbDataOut_callback(urb_t *urb) void zfLnxUsbDataOut_callback(urb_t *urb)
#else
void zfLnxUsbDataOut_callback(urb_t *urb, struct pt_regs *regs)
#endif
{ {
zdev_t* dev = urb->context; zdev_t* dev = urb->context;
//UsbTxQ_t *TxData; //UsbTxQ_t *TxData;
@@ -289,11 +285,7 @@ void zfLnxUsbDataOut_callback(urb_t *urb, struct pt_regs *regs)
} }
} }
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
void zfLnxUsbDataIn_callback(urb_t *urb) void zfLnxUsbDataIn_callback(urb_t *urb)
#else
void zfLnxUsbDataIn_callback(urb_t *urb, struct pt_regs *regs)
#endif
{ {
zdev_t* dev = urb->context; zdev_t* dev = urb->context;
struct usbdrv_private *macp = dev->ml_priv; struct usbdrv_private *macp = dev->ml_priv;
@@ -526,22 +518,14 @@ void zfLnxUsbDataIn_callback(urb_t *urb, struct pt_regs *regs)
#endif #endif
} }
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
void zfLnxUsbRegOut_callback(urb_t *urb) void zfLnxUsbRegOut_callback(urb_t *urb)
#else
void zfLnxUsbRegOut_callback(urb_t *urb, struct pt_regs *regs)
#endif
{ {
//dev_t* dev = urb->context; //dev_t* dev = urb->context;
//printk(KERN_ERR "zfwUsbRegOut_callback\n"); //printk(KERN_ERR "zfwUsbRegOut_callback\n");
} }
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
void zfLnxUsbRegIn_callback(urb_t *urb) void zfLnxUsbRegIn_callback(urb_t *urb)
#else
void zfLnxUsbRegIn_callback(urb_t *urb, struct pt_regs *regs)
#endif
{ {
zdev_t* dev = urb->context; zdev_t* dev = urb->context;
u32_t rsp[64/4]; u32_t rsp[64/4];