mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 18:13:26 -04:00
staging: wilc1000: remove platform version checks
For code that is integrated into mainline Linux, checks for the OS platform make no sense, because we know that we are on Linux. This removes all checks and the associated dead code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
e5af056149
commit
544c69dc83
@@ -13,8 +13,7 @@ ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \
|
||||
ccflags-y += -I$(src)/ -DEXPORT_SYMTAB -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 \
|
||||
-DPLL_WORKAROUND -DCONNECT_DIRECT -DAGING_ALG \
|
||||
-DWILC_PARSE_SCAN_IN_HOST -DDISABLE_PWRSAVE_AND_SCAN_DURING_IP \
|
||||
-DWILC_PLATFORM=WILC_LINUXKERNEL -Wno-unused-function -DUSE_WIRELESS \
|
||||
-DWILC_DEBUGFS
|
||||
-Wno-unused-function -DUSE_WIRELESS -DWILC_DEBUGFS
|
||||
#ccflags-y += -DTCP_ACK_FILTER
|
||||
|
||||
ccflags-$(CONFIG_WILC1000_PREALLOCATE_DURING_SYSTEM_BOOT) += -DMEMORY_STATIC \
|
||||
|
||||
@@ -2123,7 +2123,6 @@ WILC_Sint32 CoreConfiguratorDeInit(void)
|
||||
|
||||
|
||||
#ifndef SIMULATION
|
||||
#if WILC_PLATFORM != WILC_WIN32
|
||||
/*Using the global handle of the driver*/
|
||||
extern wilc_wlan_oup_t *gpstrWlanOps;
|
||||
/**
|
||||
@@ -2198,4 +2197,3 @@ WILC_Sint32 SendConfigPkt(WILC_Uint8 u8Mode, tstrWID *pstrWIDs,
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,18 +1,3 @@
|
||||
/*
|
||||
* Automatically generated C config: don't edit
|
||||
* Tue Aug 10 19:52:12 2010
|
||||
*/
|
||||
|
||||
/* OSes supported */
|
||||
#define WILC_WIN32 0
|
||||
#define WILC_NU 1
|
||||
#define WILC_MTK 2
|
||||
#define WILC_LINUX 3
|
||||
#define WILC_LINUXKERNEL 4
|
||||
/* the current OS */
|
||||
/* #define WILC_PLATFORM WILC_LINUXKERNEL */
|
||||
|
||||
|
||||
/* Logs options */
|
||||
#define WILC_LOGS_NOTHING 0
|
||||
#define WILC_LOGS_WARN 1
|
||||
|
||||
@@ -46,21 +46,7 @@ typedef WILC_Uint16 WILC_WideChar;
|
||||
|
||||
/* Os Configuration File */
|
||||
#include "wilc_osconfig.h"
|
||||
|
||||
/* Platform specific include */
|
||||
#if WILC_PLATFORM == WILC_WIN32
|
||||
#include "wilc_platform.h"
|
||||
#elif WILC_PLATFORM == WILC_NU
|
||||
#include "wilc_platform.h"
|
||||
#elif WILC_PLATFORM == WILC_MTK
|
||||
#include "wilc_platform.h"
|
||||
#elif WILC_PLATFORM == WILC_LINUX
|
||||
#include "wilc_platform.h"
|
||||
#elif WILC_PLATFORM == WILC_LINUXKERNEL
|
||||
#include "wilc_platform.h"
|
||||
#else
|
||||
#error "OS not supported"
|
||||
#endif
|
||||
|
||||
/* Logging Functions */
|
||||
#include "wilc_log.h"
|
||||
|
||||
Reference in New Issue
Block a user