OSDN Git Service

staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 14 Jul 2011 02:58:46 +0000 (21:58 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Wed, 24 Aug 2011 01:55:15 +0000 (20:55 -0500)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
drivers/staging/rtl8192e/rtl819x_BAProc.c
drivers/staging/rtl8192e/rtllib_module.c
drivers/staging/rtl8192e/rtllib_softmac.c
drivers/staging/rtl8192e/rtllib_tx.c

index 3d9f760..ce5343e 100644 (file)
@@ -19,9 +19,6 @@
 #include "rtllib.h"
 #include "rtl819x_BA.h"
 #include "rtl_core.h"
-#ifdef RTK_DMP_PLATFORM
-#include <linux/usb_setting.h>
-#endif
 
 void ActivateBAEntry(struct rtllib_device* ieee, PBA_RECORD pBA, u16 Time)
 {
index 5373de6..2182e56 100644 (file)
@@ -88,13 +88,9 @@ static inline int rtllib_networks_allocate(struct rtllib_device *ieee)
        if (ieee->networks)
                return 0;
 
-#ifndef RTK_DMP_PLATFORM
        ieee->networks = kmalloc(
                MAX_NETWORK_COUNT * sizeof(struct rtllib_network),
                GFP_KERNEL);
-#else
-       ieee->networks = dvr_malloc(MAX_NETWORK_COUNT * sizeof(struct rtllib_network));
-#endif
        if (!ieee->networks) {
                printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
                       ieee->dev->name);
@@ -111,11 +107,7 @@ static inline void rtllib_networks_free(struct rtllib_device *ieee)
 {
        if (!ieee->networks)
                return;
-#ifndef RTK_DMP_PLATFORM
        kfree(ieee->networks);
-#else
-       dvr_free(ieee->networks);
-#endif
        ieee->networks = NULL;
 }
 
index b9b5a10..a0cd746 100644 (file)
@@ -23,9 +23,6 @@
 #include <asm/uaccess.h>
 #include "dot11d.h"
 
-#ifdef RTK_DMP_PLATFORM
-#include <linux/usb_setting.h>
-#endif
 extern void _setup_timer( struct timer_list*, void*, unsigned long );
 u8 rsn_authen_cipher_suite[16][4] = {
        {0x00,0x0F,0xAC,0x00},
@@ -1634,9 +1631,6 @@ void rtllib_associate_complete_wq(void *data)
        if (ieee->data_hard_resume)
                ieee->data_hard_resume(ieee->dev);
 
-#ifdef RTK_DMP_PLATFORM
-       kobject_hotplug(&ieee->dev->class_dev.kobj, KOBJ_LINKUP);
-#endif
 }
 
 static void rtllib_sta_send_associnfo(struct rtllib_device *ieee)
index f93530e..0f724ca 100644 (file)
 
 #include "rtllib.h"
 
-#ifdef RTK_DMP_PLATFORM
-#include <linux/usb_setting.h>
-#endif
-
 /*