Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcmfmac: remove unused usb bmac model code.

Browse source 
clean up code.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Hante Meuleman 2012-09-19 22:21:14 +02:00 • committed by John W. Linville
parent 3ba8137676
commit 816432922b
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/wireless/brcm80211/brcmfmac/usb.c
View file

@ -134,8 +134,6 @@ struct brcmf_usbdev_info {
wait_queue_head_t ctrl_wait; wait_queue_head_t ctrl_wait;
ulong ctl_op; ulong ctl_op;
bool rxctl_deferrespok;
struct urb *bulk_urb; /* used for FW download */ struct urb *bulk_urb; /* used for FW download */
struct urb *intr_urb; /* URB for interrupt endpoint */ struct urb *intr_urb; /* URB for interrupt endpoint */
int intr_size; /* Size of interrupt message */ int intr_size; /* Size of interrupt message */
@ -301,17 +299,9 @@ brcmf_usb_recv_ctl(struct brcmf_usbdev_info *devinfo, u8 *buf, int len)
devinfo->ctl_read.wLength = cpu_to_le16p(&size); devinfo->ctl_read.wLength = cpu_to_le16p(&size);
devinfo->ctl_urb->transfer_buffer_length = size; devinfo->ctl_urb->transfer_buffer_length = size;
if (devinfo->rxctl_deferrespok) { devinfo->ctl_read.bRequestType = USB_DIR_IN
/* BMAC model */ | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
devinfo->ctl_read.bRequestType = USB_DIR_IN devinfo->ctl_read.bRequest = 1;
| USB_TYPE_VENDOR | USB_RECIP_INTERFACE;
devinfo->ctl_read.bRequest = DL_DEFER_RESP_OK;
} else {
/* full dongle model */
devinfo->ctl_read.bRequestType = USB_DIR_IN
| USB_TYPE_CLASS | USB_RECIP_INTERFACE;
devinfo->ctl_read.bRequest = 1;
}
usb_fill_control_urb(devinfo->ctl_urb, usb_fill_control_urb(devinfo->ctl_urb,
devinfo->usbdev, devinfo->usbdev,
@ -1312,8 +1302,6 @@ struct brcmf_usbdev *brcmf_usb_attach(struct brcmf_usbdev_info *devinfo,
brcmf_dbg(ERROR, "usb_alloc_urb (ctl) failed\n"); brcmf_dbg(ERROR, "usb_alloc_urb (ctl) failed\n");
goto error; goto error;
} }
devinfo->rxctl_deferrespok = 0;
devinfo->bulk_urb = usb_alloc_urb(0, GFP_ATOMIC); devinfo->bulk_urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!devinfo->bulk_urb) { if (!devinfo->bulk_urb) {
brcmf_dbg(ERROR, "usb_alloc_urb (bulk) failed\n"); brcmf_dbg(ERROR, "usb_alloc_urb (bulk) failed\n");