Commit 302d37a4 authored by Ali Bahar's avatar Ali Bahar Committed by Greg Kroah-Hartman

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

Replaced (Realtek's) _usb_submit_urb by (linux's own) usb_submit_urb.
Signed-off-by: default avatarAli Bahar <ali@internetDog.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 68e9b249
...@@ -58,7 +58,6 @@ ...@@ -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_submit_urb(x, y) usb_submit_urb(x, y)
struct __queue { struct __queue {
struct list_head queue; struct list_head queue;
......
...@@ -187,7 +187,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) ...@@ -187,7 +187,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
usb_fill_bulk_urb(piorw_urb, pusbd, pipe, usb_fill_bulk_urb(piorw_urb, pusbd, pipe,
wmem, cnt, usb_write_mem_complete, wmem, cnt, usb_write_mem_complete,
pio_queue); pio_queue);
status = _usb_submit_urb(piorw_urb, GFP_ATOMIC); status = usb_submit_urb(piorw_urb, GFP_ATOMIC);
_down_sema(&pintfpriv->io_retevt); _down_sema(&pintfpriv->io_retevt);
} }
...@@ -305,7 +305,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) ...@@ -305,7 +305,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
precvbuf->pbuf, MAX_RECVBUF_SZ, precvbuf->pbuf, MAX_RECVBUF_SZ,
r8712_usb_read_port_complete, r8712_usb_read_port_complete,
precvbuf); precvbuf);
err = _usb_submit_urb(purb, GFP_ATOMIC); err = usb_submit_urb(purb, GFP_ATOMIC);
if ((err) && (err != (-EPERM))) if ((err) && (err != (-EPERM)))
ret = _FAIL; ret = _FAIL;
} else } else
...@@ -462,7 +462,7 @@ u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) ...@@ -462,7 +462,7 @@ u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
pxmitframe->mem_addr, pxmitframe->mem_addr,
cnt, usb_write_port_complete, cnt, usb_write_port_complete,
pxmitframe); /* context is xmit_frame */ pxmitframe); /* context is xmit_frame */
status = _usb_submit_urb(purb, GFP_ATOMIC); status = usb_submit_urb(purb, GFP_ATOMIC);
if (!status) if (!status)
ret = _SUCCESS; ret = _SUCCESS;
else else
......
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