From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 13 Nov 2008 23:35:52 +0000 (-0800)
Subject: Staging: otus: fix urb callback function type
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=707eefb8ee714ecaae436980cf19a7e7eb171cf1;p=linux-beck.git

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: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c
index 5768675b5358..e00bf318cba1 100644
--- a/drivers/staging/otus/wwrap.c
+++ b/drivers/staging/otus/wwrap.c
@@ -259,11 +259,7 @@ u32_t zfLnxPutUsbRxBuffer(zdev_t *dev, zbuf_t *buf)
     return 0;
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 void zfLnxUsbDataOut_callback(urb_t *urb)
-#else
-void zfLnxUsbDataOut_callback(urb_t *urb, struct pt_regs *regs)
-#endif
 {
     zdev_t* dev = urb->context;
     //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)
-#else
-void zfLnxUsbDataIn_callback(urb_t *urb, struct pt_regs *regs)
-#endif
 {
     zdev_t* dev = urb->context;
     struct usbdrv_private *macp = dev->ml_priv;
@@ -526,22 +518,14 @@ void zfLnxUsbDataIn_callback(urb_t *urb, struct pt_regs *regs)
 #endif
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 void zfLnxUsbRegOut_callback(urb_t *urb)
-#else
-void zfLnxUsbRegOut_callback(urb_t *urb, struct pt_regs *regs)
-#endif
 {
     //dev_t* dev = urb->context;
 
     //printk(KERN_ERR "zfwUsbRegOut_callback\n");
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 void zfLnxUsbRegIn_callback(urb_t *urb)
-#else
-void zfLnxUsbRegIn_callback(urb_t *urb, struct pt_regs *regs)
-#endif
 {
     zdev_t* dev = urb->context;
     u32_t rsp[64/4];