Commit 707eefb8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: otus: fix urb callback function type

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 063e95c7
...@@ -259,11 +259,7 @@ u32_t zfLnxPutUsbRxBuffer(zdev_t *dev, zbuf_t *buf) ...@@ -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) ...@@ -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) ...@@ -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];
......
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