mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-03 17:40:04 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Ali Bahar 2011-09-04 03:14:07 +08:00 committed by Greg Kroah-Hartman
parent 7bcd9ce6de
commit 68e9b24956
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/rtl8712/osdep_service.h
View file

@ -58,7 +58,6 @@
#include "ethernet.h" #include "ethernet.h"
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/firmware.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) #define _usb_submit_urb(x, y) usb_submit_urb(x, y)
struct __queue { struct __queue {

2
drivers/staging/rtl8712/recv_linux.c
View file

@ -51,7 +51,7 @@ int r8712_os_recvbuf_resource_alloc(struct _adapter *padapter,
int res = _SUCCESS; int res = _SUCCESS;
precvbuf->irp_pending = false; precvbuf->irp_pending = false;
precvbuf->purb = _usb_alloc_urb(0, GFP_KERNEL); precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);
if (precvbuf->purb == NULL) if (precvbuf->purb == NULL)
res = _FAIL; res = _FAIL;
precvbuf->pskb = NULL; precvbuf->pskb = NULL;

2
drivers/staging/rtl8712/usb_ops_linux.c
View file

@ -48,7 +48,7 @@ struct zero_bulkout_context {
uint r8712_usb_init_intf_priv(struct intf_priv *pintfpriv) 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) if (!pintfpriv->piorw_urb)
return _FAIL; return _FAIL;
sema_init(&(pintfpriv->io_retevt), 0); sema_init(&(pintfpriv->io_retevt), 0);

2
drivers/staging/rtl8712/xmit_linux.c
View file

@ -113,7 +113,7 @@ int r8712_xmit_resource_alloc(struct _adapter *padapter,
int i; int i;
for (i = 0; i < 8; 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) { if (pxmitbuf->pxmit_urb[i] == NULL) {
printk(KERN_ERR "r8712u: pxmitbuf->pxmit_urb[i]" printk(KERN_ERR "r8712u: pxmitbuf->pxmit_urb[i]"
" == NULL"); " == NULL");