staging: r8712u: Merging Realtek's latest (v2.6.6). Removed _usb_alloc_urb.

Replaced (Realtek's) _usb_alloc_urb by (linux's own) usb_alloc_urb.

Signed-off-by: Ali Bahar <ali@internetDog.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 799ebaca2da7d2e3e39e9ce444270928edb3a9b5..72bb19520b487c8bb95bff5917aefca855847fd0 100644 (file)
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -58,7 +58,6 @@
 #include "ethernet.h"
 #include <linux/if_arp.h>
 #include <linux/firmware.h>
-#define   _usb_alloc_urb(x, y)       usb_alloc_urb(x, y)
 #define   _usb_submit_urb(x, y)     usb_submit_urb(x, y)
 
 struct __queue {

diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c
index 1f0949ed7ee0758a433eac08a6c1a8d092a80ba0..1e5c59be3a20b7719c24ceb513ab00d765c12287 100644 (file)
--- a/drivers/staging/rtl8712/recv_linux.c
+++ b/drivers/staging/rtl8712/recv_linux.c
@@ -51,7 +51,7 @@ int r8712_os_recvbuf_resource_alloc(struct _adapter *padapter,
        int res = _SUCCESS;
 
        precvbuf->irp_pending = false;
-       precvbuf->purb = _usb_alloc_urb(0, GFP_KERNEL);
+       precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);
        if (precvbuf->purb == NULL)
                res = _FAIL;
        precvbuf->pskb = NULL;

diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c
index 7933ea4f632b09b103c36d1e0455cedb221a8816..509b81a98d40762453d0769f461d64de374103ec 100644 (file)
--- a/drivers/staging/rtl8712/usb_ops_linux.c
+++ b/drivers/staging/rtl8712/usb_ops_linux.c
@@ -48,7 +48,7 @@ struct zero_bulkout_context {
 
 uint r8712_usb_init_intf_priv(struct intf_priv *pintfpriv)
 {
-       pintfpriv->piorw_urb = _usb_alloc_urb(0, GFP_ATOMIC);
+       pintfpriv->piorw_urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!pintfpriv->piorw_urb)
                return _FAIL;
        sema_init(&(pintfpriv->io_retevt), 0);

diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
index 3efebeb4bcc605a86b14b1b9c3518ce602291911..6b7987d3a1cb5200de6835dd457f35eefa56efa0 100644 (file)
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -113,7 +113,7 @@ int r8712_xmit_resource_alloc(struct _adapter *padapter,
        int i;
 
        for (i = 0; i < 8; i++) {
-               pxmitbuf->pxmit_urb[i] = _usb_alloc_urb(0, GFP_KERNEL);
+               pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
                if (pxmitbuf->pxmit_urb[i] == NULL) {
                        printk(KERN_ERR "r8712u: pxmitbuf->pxmit_urb[i]"
                            " == NULL");