staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM (6e2c538f) · Commits · jan.koester / Linux

drivers/staging/rtl8192e/rtl819x_BAProc.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -19,9 +19,6 @@
	#include "rtllib.h"		#include "rtllib.h"
	#include "rtl819x_BA.h"		#include "rtl819x_BA.h"
	#include "rtl_core.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)		void ActivateBAEntry(struct rtllib_device* ieee, PBA_RECORD pBA, u16 Time)
	{		{

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -88,13 +88,9 @@ static inline int rtllib_networks_allocate(struct rtllib_device *ieee)
	if (ieee->networks)		if (ieee->networks)
	return 0;		return 0;

	#ifndef RTK_DMP_PLATFORM
	ieee->networks = kmalloc(		ieee->networks = kmalloc(
	MAX_NETWORK_COUNT * sizeof(struct rtllib_network),		MAX_NETWORK_COUNT * sizeof(struct rtllib_network),
	GFP_KERNEL);		GFP_KERNEL);
	#else
	ieee->networks = dvr_malloc(MAX_NETWORK_COUNT * sizeof(struct rtllib_network));
	#endif
	if (!ieee->networks) {		if (!ieee->networks) {
	printk(KERN_WARNING "%s: Out of memory allocating beacons\n",		printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
	ieee->dev->name);		ieee->dev->name);
	@@ -111,11 +107,7 @@ static inline void rtllib_networks_free(struct rtllib_device *ieee)
	{		{
	if (!ieee->networks)		if (!ieee->networks)
	return;		return;
	#ifndef RTK_DMP_PLATFORM
	kfree(ieee->networks);		kfree(ieee->networks);
	#else
	dvr_free(ieee->networks);
	#endif
	ieee->networks = NULL;		ieee->networks = NULL;
	}		}

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,6 @@
	#include <asm/uaccess.h>		#include <asm/uaccess.h>
	#include "dot11d.h"		#include "dot11d.h"

	#ifdef RTK_DMP_PLATFORM
	#include <linux/usb_setting.h>
	#endif
	extern void _setup_timer( struct timer_list, void, unsigned long );		extern void _setup_timer( struct timer_list, void, unsigned long );
	u8 rsn_authen_cipher_suite[16][4] = {		u8 rsn_authen_cipher_suite[16][4] = {
	{0x00,0x0F,0xAC,0x00},		{0x00,0x0F,0xAC,0x00},
	@@ -1634,9 +1631,6 @@ void rtllib_associate_complete_wq(void *data)
	if (ieee->data_hard_resume)		if (ieee->data_hard_resume)
	ieee->data_hard_resume(ieee->dev);		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)		static void rtllib_sta_send_associnfo(struct rtllib_device *ieee)

+0 −4