From 6e2c538f8fbca87276a83eec5ac9212bbbfa13fa Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 13 Jul 2011 21:58:46 -0500 Subject: [PATCH] staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 3 --- drivers/staging/rtl8192e/rtllib_module.c | 8 -------- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ------ drivers/staging/rtl8192e/rtllib_tx.c | 4 ---- 4 files changed, 21 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 3d9f7601e878..ce5343e5245c 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -19,9 +19,6 @@ #include "rtllib.h" #include "rtl819x_BA.h" #include "rtl_core.h" -#ifdef RTK_DMP_PLATFORM -#include -#endif void ActivateBAEntry(struct rtllib_device* ieee, PBA_RECORD pBA, u16 Time) { diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c index 5373de60ab0a..2182e56f0d23 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -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; } diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index b9b5a1053e5c..a0cd746778a7 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -23,9 +23,6 @@ #include #include "dot11d.h" -#ifdef RTK_DMP_PLATFORM -#include -#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) diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index f93530e53afa..0f724caaf6f8 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -54,10 +54,6 @@ #include "rtllib.h" -#ifdef RTK_DMP_PLATFORM -#include -#endif - /* -- 2.30.2