staging: rtl8723au: Remove nasty wrappers used to hide wrong function types

Do not use #defines to hack around pre-history functions not matching
current APIs

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
index e156377b681efd9bf50791f1c4c29ce1676cdd1b..2eba530a1c6c27d40be6c94f46e9529bca0284e2 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
@@ -343,7 +343,7 @@ InterruptRecognized8723AU(struct rtw_adapter *Adapter, void *pContent,
                (pHalData->IntArray[1] & pHalData->IntrMask[1]) != 0;
 }
 
-static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs)
+static void usb_read_interrupt_complete(struct urb *purb)
 {
        int err;
        struct rtw_adapter *padapter = (struct rtw_adapter *)purb->context;
@@ -643,7 +643,7 @@ void rtl8723au_recv_tasklet(void *priv)
        }
 }
 
-static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
+static void usb_read_port_complete(struct urb *purb)
 {
        struct recv_buf *precvbuf = (struct recv_buf *)purb->context;
        struct rtw_adapter *padapter = (struct rtw_adapter *)precvbuf->adapter;

diff --git a/drivers/staging/rtl8723au/include/usb_ops_linux.h b/drivers/staging/rtl8723au/include/usb_ops_linux.h
index 814bc2005c0563b55692de6d2b940c4f86df489a..fb75ff3582ae5298939c859ccf130a140e3aaaf1 100644 (file)
--- a/drivers/staging/rtl8723au/include/usb_ops_linux.h
+++ b/drivers/staging/rtl8723au/include/usb_ops_linux.h
@@ -24,13 +24,6 @@
 
 #define RTW_USB_BULKOUT_TIMEOUT        5000/* ms */
 
-#define _usbctrl_vendorreq_async_callback(urb, regs)           \
-       _usbctrl_vendorreq_async_callback(urb)
-#define usb_write_port23a_complete(purb, regs) usb_write_port23a_complete(purb)
-#define usb_read_port_complete(purb, regs)     usb_read_port_complete(purb)
-#define usb_read_interrupt_complete(purb, regs)                        \
-       usb_read_interrupt_complete(purb)
-
 unsigned int ffaddr2pipehdl23a(struct dvobj_priv *pdvobj, u32 addr);
 
 void usb_read_port_cancel23a(struct rtw_adapter *adapter);

diff --git a/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c b/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
index 6af475707bb8bc2cbcd5e2eb26af66c5778f2531..3bcb781a9d50197af40ff43ce796ff051e88dc29 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
@@ -60,7 +60,7 @@ void usb_read_port_cancel23a(struct rtw_adapter *padapter)
        usb_kill_urb(padapter->recvpriv.int_in_urb);
 }
 
-static void usb_write_port23a_complete(struct urb *purb, struct pt_regs *regs)
+static void usb_write_port23a_complete(struct urb *purb)
 {
        struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
        struct rtw_adapter *padapter = pxmitbuf->padapter;