summaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm/InterfaceTx.c
diff options
context:
space:
mode:
authorDan Carpenter2010-12-06 08:02:36 +0100
committerGreg Kroah-Hartman2010-12-07 01:09:45 +0100
commitcd0b0ebfbe134b9c98fa8e628732b0e41b2cb48c (patch)
treeed9ab1bd99152b28147637d3ca511c0ba378ae79 /drivers/staging/bcm/InterfaceTx.c
parentStaging: Beceem: white space changes to InterfaceInit.c (diff)
downloadkernel-qcow2-linux-cd0b0ebfbe134b9c98fa8e628732b0e41b2cb48c.tar.gz
kernel-qcow2-linux-cd0b0ebfbe134b9c98fa8e628732b0e41b2cb48c.tar.xz
kernel-qcow2-linux-cd0b0ebfbe134b9c98fa8e628732b0e41b2cb48c.zip
Staging: Beceem: remove old kernel compatibility code
This drops compatability for everything from 2.4 to 2.6.35. Now it only works on the latest kernel. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/bcm/InterfaceTx.c')
-rw-r--r--drivers/staging/bcm/InterfaceTx.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index f434b899a0d0..a842de9de6b5 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -102,13 +102,8 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
}
err_exit :
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
- usb_buffer_free(urb->dev, urb->transfer_buffer_length,
- urb->transfer_buffer, urb->transfer_dma);
-#else
usb_free_coherent(urb->dev, urb->transfer_buffer_length,
urb->transfer_buffer, urb->transfer_dma);
-#endif
}
@@ -139,14 +134,8 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID
struct urb *urb = pTcb->urb;
int retval = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
- urb->transfer_buffer = usb_buffer_alloc(psIntfAdapter->udev, len,
- GFP_ATOMIC, &urb->transfer_dma);
-#else
urb->transfer_buffer = usb_alloc_coherent(psIntfAdapter->udev, len,
GFP_ATOMIC, &urb->transfer_dma);
-#endif
-
if (!urb->transfer_buffer)
{
BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Error allocating memory\n");