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>

diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 844e5faacca0e81b6daaa04f6a625fd7f71abb3d..dd829409a8c848618dafcea91ae89d0afab99fc7 100644 (file)
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -235,25 +235,14 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
 #ifdef CONFIG_PM
                        udev->autosuspend_delay = 0;
                        intf->needs_remote_wakeup = 1;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                       udev->autosuspend_disabled = 0;
-#else
                        usb_enable_autosuspend(udev);
-#endif
                        device_init_wakeup(&intf->dev, 1);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
-                       usb_autopm_disable(intf);
-#endif
                        INIT_WORK(&psIntfAdapter->usbSuspendWork, putUsbSuspend);
                        BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Enabling USB Auto-Suspend\n");
 #endif
                } else {
                        intf->needs_remote_wakeup = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                       udev->autosuspend_disabled = 1;
-#else
                        usb_disable_autosuspend(udev);
-#endif
                }
        }
 
@@ -633,9 +622,7 @@ static int InterfaceResume(struct usb_interface *intf)
        PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
        printk("=================================\n");
        mdelay(100);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
-       intf->pm_usage_cnt =1 ;
-#endif
+
        psIntfAdapter->bSuspended = FALSE;
 
        StartInterruptUrb(psIntfAdapter);

diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index f434b899a0d02ecddadaf66ba961107df912e747..a842de9de6b596d4e508233f5d3ec3d553179d7c 100644 (file)
--- 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");

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 9588fbe101d98d5e964496a5b47a1da040e2cddc..f585aae9cf8b255419cc8d8b2d0c90d0bd1caa62 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -233,9 +233,7 @@ static int BcmFileDownload(PMINI_ADAPTER Adapter,/**< Logical Adapter */
         goto exit_download;
     }
     oldfs=get_fs();set_fs(get_ds());
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     vfs_llseek(flp, 0, 0);
-#endif
     set_fs(oldfs);
     if(Adapter->bcm_file_readback_from_chip(Adapter->pvInterfaceAdapter,
                                                                                flp, loc))

diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h
index 473f11eebf7c22fbffaecdb58d5b87e3dfc61762..1148e5e22eb9de5214025d4f10aa2e3257e0c018 100644 (file)
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
@@ -35,9 +35,7 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <asm/uaccess.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/kthread.h>
-#endif
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/usb.h>