wilc1000: dead code removal and other cleanup
cover wilc1000: dead code removal and other cleanup
Hi Greg,
This turned out to be more work than the first version, but I think I've split it up enough sensibly to allow review, and I've added a few more patches at the end.
Arnd
Arnd Bergmann (16):
staging: wilc1000: remove linux version checks
staging: wilc1000: remove platform version checks
staging: wilc1000: remove thread wrapper
staging: wilc1000: remove __DRIVER_VERSION__ macro
staging: wilc1000: remove time wrapper
staging: wilc1000: remove unused string functions
staging: wilc1000: simplify msgqueue code
staging: wilc1000: remove unused memory handling code
staging: wilc1000: simplify semaphore wrapper
staging: wilc1000: clean up sleep wrapper
staging: wilc1000: clean up timer feature
staging: wilc1000: remove unused OS abstraction features
staging: wilc1000: remove EXPORT_SYMTAB
staging: wilc1000: remove semaphore wrapper
staging: wilc1000: fix const cast warnings
staging: wilc1000: fix compiler warnings
drivers/staging/wilc1000/Makefile | 13 +- drivers/staging/wilc1000/coreconfigurator.c | 31 +- drivers/staging/wilc1000/fifo_buffer.c | 108 ++--- drivers/staging/wilc1000/fifo_buffer.h | 2 +- drivers/staging/wilc1000/host_interface.c | 219 ++++----- drivers/staging/wilc1000/host_interface.h | 40 +- drivers/staging/wilc1000/linux_mon.c | 2 +- drivers/staging/wilc1000/linux_wlan.c | 98 +--- drivers/staging/wilc1000/linux_wlan_spi.c | 3 - drivers/staging/wilc1000/wilc_errorsupport.h | 17 - drivers/staging/wilc1000/wilc_event.h | 123 ----- drivers/staging/wilc1000/wilc_memory.c | 7 +- drivers/staging/wilc1000/wilc_memory.h | 95 +--- drivers/staging/wilc1000/wilc_msgqueue.c | 41 +- drivers/staging/wilc1000/wilc_msgqueue.h | 30 -- drivers/staging/wilc1000/wilc_osconfig.h | 46 -- drivers/staging/wilc1000/wilc_oswrapper.h | 61 --- drivers/staging/wilc1000/wilc_platform.h | 131 +----- drivers/staging/wilc1000/wilc_semaphore.c | 70 --- drivers/staging/wilc1000/wilc_semaphore.h | 115 ----- drivers/staging/wilc1000/wilc_sleep.c | 18 - drivers/staging/wilc1000/wilc_sleep.h | 30 +- drivers/staging/wilc1000/wilc_spi.c | 4 +- drivers/staging/wilc1000/wilc_strutils.c | 351 -------------- drivers/staging/wilc1000/wilc_strutils.h | 282 ------------ drivers/staging/wilc1000/wilc_thread.c | 35 -- drivers/staging/wilc1000/wilc_thread.h | 153 ------- drivers/staging/wilc1000/wilc_time.c | 163 ------- drivers/staging/wilc1000/wilc_time.h | 205 --------- drivers/staging/wilc1000/wilc_timer.c | 6 - drivers/staging/wilc1000/wilc_timer.h | 27 -- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 533 +--------------------- drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 9 +- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 12 +- drivers/staging/wilc1000/wilc_wlan.c | 6 +- 35 files changed, 226 insertions(+), 2860 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_event.h delete mode 100644 drivers/staging/wilc1000/wilc_semaphore.c delete mode 100644 drivers/staging/wilc1000/wilc_semaphore.h delete mode 100644 drivers/staging/wilc1000/wilc_thread.c delete mode 100644 drivers/staging/wilc1000/wilc_thread.h delete mode 100644 drivers/staging/wilc1000/wilc_time.c delete mode 100644 drivers/staging/wilc1000/wilc_time.h
Signature · 1 line
2.1.0.rc2
PATCH 1/16 staging: wilc1000: remove linux version checks
For code that is integrated into mainline Linux, checks for the kernel version make no sense, because we know which version we are compiling against.
This removes all checks and the associated dead code.
--- drivers/staging/wilc1000/linux_wlan.c | 88 +--- drivers/staging/wilc1000/wilc_sleep.c | 8 - drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 486 +--------------------- drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 7 +- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 8 - 5 files changed, 5 insertions(+), 592 deletions(-)
drivers/staging/wilc1000/linux_wlan.c +1 -87
@@ -180,7 +180,6 @@ linux_wlan_t *g_linux_wlan;wilc_wlan_oup_t *gpstrWlanOps;WILC_Bool bEnablePS =WILC_TRUE ; -#if LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,2 ,0 )static const struct net_device_ops wilc_netdev_ops = { .ndo_init = mac_init_fn, .ndo_open = mac_open,
@@ -191,37 +190,7 @@ static const struct net_device_ops wilc_netdev_ops = { .ndo_set_rx_mode = wilc_set_multicast_list, }; -#define wilc_set_netdev_ops (ndev) do { (ndev)->netdev_ops = &wilc_netdev_ops; } while (0) -#elif LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,29 ) -static const struct net_device_ops wilc_netdev_ops = { - .ndo_init = mac_init_fn, - .ndo_open = mac_open, - .ndo_stop = mac_close, - .ndo_start_xmit = mac_xmit, - .ndo_do_ioctl = mac_ioctl, - .ndo_get_stats = mac_stats, - .ndo_set_multicast_list = wilc_set_multicast_list, - -}; - -#define wilc_set_netdev_ops (ndev) do { (ndev)->netdev_ops = &wilc_netdev_ops; } while (0) - -#else - -static void wilc_set_netdev_ops (struct net_device *ndev) -{ - - ndev->init = mac_init_fn; - ndev->open = mac_open; - ndev->stop = mac_close; - ndev->hard_start_xmit = mac_xmit; - ndev->do_ioctl = mac_ioctl; - ndev->get_stats = mac_stats; - ndev->set_multicast_list = wilc_set_multicast_list, -} - -#endif #ifdef DEBUG_MODE extern volatile int timeNo;
@@ -594,12 +563,7 @@ static void linux_wlan_msleep(uint32_t msc) {if (msc <=4000000 ) {WILC_Uint32 u32Temp = msc *1000 ; -#if LINUX_VERSION_CODE >KERNEL_VERSION (2 ,6 ,35 )usleep_range (u32Temp, u32Temp); -#else -/* This is delay not sleep !!!, has to be changed*/ -msleep (msc); -#endif }else {msleep (msc); }
@@ -2195,7 +2159,6 @@ struct net_device_stats *mac_stats(struct net_device *dev) }/* Setup the multicast filter */ -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,34 )static void wilc_set_multicast_list (struct net_device *dev) {
@@ -2251,55 +2214,6 @@ static void wilc_set_multicast_list(struct net_device *dev) } -#else - -static void wilc_set_multicast_list (struct net_device *dev) -{ -/* BIG Warning, Beware : Uncompiled, untested... */ -struct dev_mc_list *mc_ptr; -int i =0 ; - -if (!dev) -return ; - -PRINT_D (INIT_DBG ,"Setting Multicast List. \n" ); -PRINT_D (INIT_DBG ,"dev->mc_count = %d\n" , dev->mc_count); - -if (dev->flags &IFF_PROMISC ) { -/* Normally, we should configure the chip to retrive all packets -* but we don't wanna support this right now */ -/* TODO: add promiscuous mode support */ -PRINT_D (INIT_DBG ,"Set promiscuous mode ON, retrive all packets \n" ); -return ; - } - -/* If there's more addresses than we handle, get all multicast -* packets and sort them out in software. */ -if ((dev->flags &IFF_ALLMULTI ) || (dev->mc_count >WILC_MULTICAST_TABLE_SIZE )) { -PRINT_D (INIT_DBG ,"Disable multicast filter, retrive all multicast packets\n" ); -host_int_setup_multicast_filter ((WILC_WFIDrvHandle )gWFiDrvHandle,WILC_FALSE ,0 ); -return ; - } - -/* No multicast? Just get our own stuff */ -if (dev->mc_count ==0 ) { -PRINT_D (INIT_DBG ,"Enable multicast filter, retrive directed packets only.\n" ); -host_int_setup_multicast_filter ((WILC_WFIDrvHandle )gWFiDrvHandle,WILC_TRUE ,0 ); -return ; - } - -/* Store all of the multicast addresses in the hardware filter */ - -for (mc_ptr = dev->mc_list; mc_ptr; mc_ptr = mc_ptr->next, i++) { -WILC_memcpy (gau8MulticastMacAddrList[i], mc_ptr->dmi_addr,ETH_ALEN ) - i++; - } - -host_int_setup_multicast_filter ((WILC_WFIDrvHandle )gWFiDrvHandle,WILC_TRUE , (dev->mc_count)); - -} -#endif -static void linux_wlan_tx_complete (void *priv,int status) {
@@ -2765,7 +2679,7 @@ int wilc_netdev_init(void) nic->wilc_netdev = ndev; g_linux_wlan->strInterfaceInfo[g_linux_wlan->u8NoIfcs].wilc_netdev = ndev; g_linux_wlan->u8NoIfcs++; -wilc_set_netdev_ops (ndev); + ndev->netdev_ops = &wilc_netdev_ops;#ifdef USE_WIRELESS {
drivers/staging/wilc1000/wilc_sleep.c +0 -8
@@ -12,11 +12,7 @@ void WILC_Sleep(WILC_Uint32 u32TimeMilliSec) {if (u32TimeMilliSec <=4000000 ) {WILC_Uint32 u32Temp = u32TimeMilliSec *1000 ; -#if LINUX_VERSION_CODE >KERNEL_VERSION (2 ,6 ,35 )usleep_range (u32Temp, u32Temp); -#else -udelay (u32Temp); -#endif }else {msleep (u32TimeMilliSec); }
@@ -27,10 +23,6 @@ void WILC_Sleep(WILC_Uint32 u32TimeMilliSec)/* #ifdef CONFIG_WILC_SLEEP_HI_RES */ void WILC_SleepMicrosec (WILC_Uint32 u32TimeMicoSec) { -#if LINUX_VERSION_CODE >KERNEL_VERSION (2 ,6 ,35 )usleep_range (u32TimeMicoSec, u32TimeMicoSec); -#else -udelay (u32TimeMicoSec); -#endif }/* #endif */
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -483
984 lines not on this page · raw message
drivers/staging/wilc1000/wilc_wfi_cfgoperations.h +1 -6
@@ -68,7 +68,6 @@#define nl80211_SCAN_RESULT_EXPIRE (3 * HZ)#define SCAN_RESULT_EXPIRE (40 * HZ) -#if LINUX_VERSION_CODE >KERNEL_VERSION (2 ,6 ,30 )static const u32 cipher_suites[] = {WLAN_CIPHER_SUITE_WEP40 ,WLAN_CIPHER_SUITE_WEP104 ,
@@ -76,11 +75,7 @@ static const u32 cipher_suites[] = {WLAN_CIPHER_SUITE_CCMP , WLAN_CIPHER_SUITE_AES_CMAC, }; -#endif - - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)static const struct ieee80211_txrx_stypes wilc_wfi_cfg80211_mgmt_types[NL80211_IFTYPE_MAX ] = { [NL80211_IFTYPE_STATION ] = {
@@ -110,7 +105,7 @@ static const struct ieee80211_txrx_stypes BIT(IEEE80211_STYPE_DEAUTH >> 4) } }; -#endif +/* Time to stay on the channel */ #define WILC_WFI_DWELL_PASSIVE 100#define WILC_WFI_DWELL_ACTIVE 40
drivers/staging/wilc1000/wilc_wfi_netdevice.h +0 -8
@@ -49,12 +49,7 @@#include <asm/checksum.h> #include "host_interface.h" #include "wilc_wlan.h" -#if LINUX_VERSION_CODE <=KERNEL_VERSION (2 ,6 ,30 ) -#include <net/wireless.h> -#else #include <linux/wireless.h> /* tony, 2013-06-12 */ -#endif -#define FLOW_CONTROL_LOWER_THRESHOLD 128#define FLOW_CONTROL_UPPER_THRESHOLD 256
@@ -163,9 +158,6 @@ struct WILC_WFI_priv {tstrHostIFpmkidAttr pmkid_list;struct WILC_WFI_stats netstats;WILC_Uint8 WILC_WFI_wep_default; -#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,31 ) -#define WLAN_KEY_LEN_WEP104 13 -#endif WILC_Uint8 WILC_WFI_wep_key[4 ][WLAN_KEY_LEN_WEP104 ];WILC_Uint8 WILC_WFI_wep_key_len[4 ];struct net_device *real_ndev;/* The real interface that the monitor is on */
Signature · 1 line
2.1.0.rc2
PATCH 2/16 staging: wilc1000: remove platform version checks
In reply to Arnd BergmannFor 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.
--- drivers/staging/wilc1000/Makefile | 3 +-- drivers/staging/wilc1000/coreconfigurator.c | 2 -- drivers/staging/wilc1000/wilc_osconfig.h | 15 --------------- drivers/staging/wilc1000/wilc_oswrapper.h | 14 -------------- 4 files changed, 1 insertion(+), 33 deletions(-)
drivers/staging/wilc1000/Makefile +1 -2
@@ -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 \
drivers/staging/wilc1000/coreconfigurator.c +0 -2
@@ -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
drivers/staging/wilc1000/wilc_osconfig.h +0 -15
@@ -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
drivers/staging/wilc1000/wilc_oswrapper.h +0 -14
@@ -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"
Signature · 1 line
2.1.0.rc2
PATCH 3/16 staging: wilc1000: remove thread wrapper
In reply to Arnd BergmannThe wilc_thread code is a very thin wrapper around kthread, so just remove it and use kthread directly.
--- drivers/staging/wilc1000/Makefile | 2 +- drivers/staging/wilc1000/host_interface.c | 16 ++-- drivers/staging/wilc1000/wilc_osconfig.h | 3 - drivers/staging/wilc1000/wilc_oswrapper.h | 5 - drivers/staging/wilc1000/wilc_platform.h | 14 --- drivers/staging/wilc1000/wilc_thread.c | 35 ------- drivers/staging/wilc1000/wilc_thread.h | 153 ------------------------------ 7 files changed, 8 insertions(+), 220 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_thread.c delete mode 100644 drivers/staging/wilc1000/wilc_thread.h
drivers/staging/wilc1000/Makefile +1 -1
@@ -27,7 +27,7 @@ ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC wilc1000-objs := wilc_wfi_netdevice.o wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \ wilc_memory.o wilc_msgqueue.o wilc_semaphore.o wilc_sleep.o wilc_strutils.o \ - wilc_thread.o wilc_time.o wilc_timer.o coreconfigurator.o host_interface.o \ + wilc_time.o wilc_timer.o coreconfigurator.o host_interface.o \ fifo_buffer.o wilc_sdio.o wilc_spi.o wilc_wlan_cfg.o wilc_debugfs.o wilc1000-$(CONFIG_WILC1000_SDIO) += linux_wlan_sdio.o
drivers/staging/wilc1000/host_interface.c +7 -9
@@ -543,7 +543,7 @@ tstrWILC_WFIDrv *gWFiDrvHandle = WILC_NULL;WILC_Bool g_obtainingIP =WILC_FALSE ;#endif WILC_Uint8 P2P_LISTEN_STATE ; -static WILC_ThreadHandle HostIFthreadHandler; +static struct task_struct *HostIFthreadHandler;static WILC_MsgQueueHandle gMsgQHostIF;static WILC_SemaphoreHandle hSemHostIFthrdEnd;
@@ -4370,7 +4370,7 @@ static WILC_Sint32 Handle_DelAllRxBASessions(void *drvHandler, tstrHostIfBASessi* @date * @version 1.0 */ -static void hostIFthread (void *pvArg) +static int hostIFthread (void *pvArg) {WILC_Uint32 u32Ret;tstrHostIFmsg strHostIFmsg;
@@ -4591,10 +4591,7 @@ static void hostIFthread(void *pvArg)PRINT_D (HOSTINF_DBG ,"Releasing thread exit semaphore\n" );WILC_SemaphoreRelease (&hSemHostIFthrdEnd,WILC_NULL ); -return ; -/* do_exit(error); */ -/* PRINT_D(HOSTINF_DBG,"do_exit error code %d\n",error); */ - +return 0 ; }static void TimerCB_Scan (void *pvArg)
@@ -6683,9 +6680,10 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv) goto _fail_; } msgQ_created =1 ; - s32Error =WILC_ThreadCreate (&HostIFthreadHandler, hostIFthread,WILC_NULL ,WILC_NULL ); -if (s32Error <0 ) { + HostIFthreadHandler =kthread_run (hostIFthread,NULL ,"WILC_kthread" ); +if (IS_ERR (HostIFthreadHandler)) {PRINT_ER ("Failed to creat Thread\n" ); + s32Error =WILC_FAIL ; goto _fail_mq_; } s32Error =WILC_TimerCreate (&(g_hPeriodicRSSI), GetPeriodicRSSI,WILC_NULL );
@@ -6788,7 +6786,7 @@ _fail_timer_2: _fail_timer_1:WILC_TimerDestroy (&(pstrWFIDrv->hScanTimer),WILC_NULL ); _fail_thread_: -WILC_ThreadDestroy (&HostIFthreadHandler,WILC_NULL ); +kthread_stop (HostIFthreadHandler); _fail_mq_:WILC_MsgQueueDestroy (&gMsgQHostIF,WILC_NULL ); _fail_:
drivers/staging/wilc1000/wilc_osconfig.h +0 -3
@@ -10,9 +10,6 @@/* OS features supported */ -#define CONFIG_WILC_THREAD_FEATURE 1 -/* #define CONFIG_WILC_THREAD_SUSPEND_CONTROL 1 */ -/* #define CONFIG_WILC_THREAD_STRICT_PRIORITY 1 */ #define CONFIG_WILC_SEMAPHORE_FEATURE 1/* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */ #define CONFIG_WILC_SLEEP_FEATURE 1
drivers/staging/wilc1000/wilc_oswrapper.h +0 -5
@@ -54,11 +54,6 @@ typedef WILC_Uint16 WILC_WideChar;/* Error reporting and handling support */ #include "wilc_errorsupport.h" -/* Thread support */ -#ifdef CONFIG_WILC_THREAD_FEATURE -#include "wilc_thread.h" -#endif -/* Semaphore support */ #ifdef CONFIG_WILC_SEMAPHORE_FEATURE #include "wilc_semaphore.h"
drivers/staging/wilc1000/wilc_platform.h +0 -14
@@ -15,18 +15,6 @@* Feature support checks *******************************************************************/ -/* CONFIG_WILC_THREAD_FEATURE is implemented */ - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_THREAD_SUSPEND_CONTROL -#error This feature is not supported by this OS -#endif - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_THREAD_STRICT_PRIORITY -#error This feature is not supported by this OS -#endif -/* CONFIG_WILC_SEMAPHORE_FEATURE is implemented */ /* remove the following block when implementing its feature
@@ -140,8 +128,6 @@* OS specific types *******************************************************************/ -typedef struct task_struct *WILC_ThreadHandle ; -typedef void *WILC_MemoryPoolHandle ;typedef struct semaphore WILC_SemaphoreHandle ;
drivers/staging/wilc1000/wilc_thread.c deleted +0 -35
@@ -1,35 +0,0 @@ - -#include "wilc_oswrapper.h" - -#ifdef CONFIG_WILC_THREAD_FEATURE - - - -WILC_ErrNo WILC_ThreadCreate (WILC_ThreadHandle *pHandle,tpfWILC_ThreadFunction pfEntry, -void *pvArg,tstrWILC_ThreadAttrs *pstrAttrs) -{ - - - *pHandle =kthread_run ((int (*)(void *))pfEntry, pvArg,"WILC_kthread" ); - - -if (IS_ERR (*pHandle)) { -return WILC_FAIL ; - }else { -return WILC_SUCCESS ; - } - -} - -WILC_ErrNo WILC_ThreadDestroy (WILC_ThreadHandle *pHandle, -tstrWILC_ThreadAttrs *pstrAttrs) -{ -WILC_ErrNo s32RetStatus =WILC_SUCCESS ; - -kthread_stop (*pHandle); -return s32RetStatus; -} - - - -#endif
drivers/staging/wilc1000/wilc_thread.h deleted +0 -153
153 lines not on this page · raw message
Signature · 1 line
2.1.0.rc2
PATCH 4/16 staging: wilc1000: remove __DRIVER_VERSION__ macro
In reply to Arnd BergmannThe driver version is meaningless, and in particular does not have to be passed from the Makefile. This removes the macros, but leaves the behavior of printing the 10.2 version untouched for the moment.
--- drivers/staging/wilc1000/Makefile | 6 ------ drivers/staging/wilc1000/linux_wlan.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/wilc1000/Makefile +0 -6
@@ -32,9 +32,3 @@ wilc1000-objs := wilc_wfi_netdevice.o wilc_wfi_cfgoperations.o linux_wlan.o linu wilc1000-$(CONFIG_WILC1000_SDIO) += linux_wlan_sdio.o wilc1000-$(CONFIG_WILC1000_SPI) += linux_wlan_spi.o - -WILC1000_SRC_VERSION = 10.0 -PATCHLEVEL = 2 -WILC1000_FW_VERSION = 0 - -ccflags-y += -D__DRIVER_VERSION__=\"$(WILC1000_SRC_VERSION).$(PATCHLEVEL)\"
drivers/staging/wilc1000/linux_wlan.c +1 -1
@@ -2747,7 +2747,7 @@ static int __init init_wilc_driver(void)#endif printk ("IN INIT FUNCTION\n" ); -printk ("*** WILC1000 driver VERSION=[%s] FW_VER=[%s] ***\n" , __DRIVER_VERSION__, __DRIVER_VERSION__); +printk ("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n" );linux_wlan_device_power (1 );msleep (100 );
Signature · 1 line
2.1.0.rc2
PATCH 5/16 staging: wilc1000: remove time wrapper
In reply to Arnd BergmannThe abstraction for time in this driver is completely unused, so remove it.
--- drivers/staging/wilc1000/wilc_osconfig.h | 1 - drivers/staging/wilc1000/wilc_oswrapper.h | 5 - drivers/staging/wilc1000/wilc_platform.h | 12 -- drivers/staging/wilc1000/wilc_time.c | 163 ------------------------ drivers/staging/wilc1000/wilc_time.h | 205 ------------------------------ 5 files changed, 386 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_time.c delete mode 100644 drivers/staging/wilc1000/wilc_time.h
drivers/staging/wilc1000/wilc_osconfig.h +0 -1
@@ -27,7 +27,6 @@/* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */ /* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */ /* #define CONFIG_WILC_FILE_OPERATIONS_PATH_API */ -#define CONFIG_WILC_TIME_FEATURE /* #define CONFIG_WILC_EVENT_FEATURE */ /* #define CONFIG_WILC_EVENT_TIMEOUT */ /* #define CONFIG_WILC_SOCKET_FEATURE */
drivers/staging/wilc1000/wilc_oswrapper.h +0 -5
@@ -89,11 +89,6 @@ typedef WILC_Uint16 WILC_WideChar;#include "wilc_fileops.h" #endif -/* Time operations */ -#ifdef CONFIG_WILC_TIME_FEATURE -#include "wilc_time.h" -#endif -/* Event support */ #ifdef CONFIG_WILC_EVENT_FEATURE #include "wilc_event.h"
drivers/staging/wilc1000/wilc_platform.h +0 -12
@@ -73,18 +73,6 @@#error This feature is not supported by this OS#endif -/* CONFIG_WILC_TIME_FEATURE is implemented */ - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_TIME_UTC_SINCE_1970 -#error This feature is not supported by this OS -#endif - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_TIME_CALENDER -#error This feature is not supported by this OS -#endif -/* remove the following block when implementing its feature */ #ifdef CONFIG_WILC_EVENT_FEATURE #error This feature is not supported by this OS
drivers/staging/wilc1000/wilc_time.c deleted +0 -163
163 lines not on this page · raw message
drivers/staging/wilc1000/wilc_time.h deleted +0 -205
205 lines not on this page · raw message
Signature · 1 line
2.1.0.rc2
Re: [PATCH 05/16] staging: wilc1000: remove time wrapper
Quoted 4 lines · Arnd Bergmann
The abstraction for time in this driver is completely unused, so remove it.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 9 lines
--- drivers/staging/wilc1000/wilc_osconfig.h | 1 - drivers/staging/wilc1000/wilc_oswrapper.h | 5 - drivers/staging/wilc1000/wilc_platform.h | 12 -- drivers/staging/wilc1000/wilc_time.c | 163 ------------------------ drivers/staging/wilc1000/wilc_time.h | 205 ------------------------------ 5 files changed, 386 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_time.c delete mode 100644 drivers/staging/wilc1000/wilc_time.h
after this patch I am getting:
"WARNING: could not open drivers/staging/wilc1000/wilc_time.c: No such file or directory"
wilc_time is mentioned in the Makefile, it should have been removed from there also.
regards
sudip
Greg KH
maintainerRe: [PATCH 05/16] staging: wilc1000: remove time wrapper
Quoted 14 lines · Sudip Mukherjee
Quoted 4 lines · Arnd Bergmann
The abstraction for time in this driver is completely unused, so remove it.
Signed-off-by Arnd Bergmann <[email protected]>Quoted 9 lines
--- drivers/staging/wilc1000/wilc_osconfig.h | 1 - drivers/staging/wilc1000/wilc_oswrapper.h | 5 - drivers/staging/wilc1000/wilc_platform.h | 12 -- drivers/staging/wilc1000/wilc_time.c | 163 ------------------------ drivers/staging/wilc1000/wilc_time.h | 205 ------------------------------ 5 files changed, 386 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_time.c delete mode 100644 drivers/staging/wilc1000/wilc_time.h
Quoted 5 lines
after this patch I am getting:
"WARNING: could not opendrivers/staging/wilc1000/wilc_time.c: No such file or directory"
wilc_timeis mentioned in theMakefile, it should have been removed from there also.
Ick, not good.
Arnd, I've applied the first 4 patches, but stopped here, can you respin the rest and resend?
thanks,
greg k-h
Re: [PATCH 05/16] staging: wilc1000: remove time wrapper
Quoted 15 lines · On Sunday 31 May 2015 08:58:13 Greg KH wrote:
Quoted 14 lines · Sudip Mukherjee
Quoted 13 lines · Arnd Bergmann
The abstraction for time in this driver is completely unused, so remove it.
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/staging/wilc1000/wilc_osconfig.h | 1 - drivers/staging/wilc1000/wilc_oswrapper.h | 5 - drivers/staging/wilc1000/wilc_platform.h | 12 -- drivers/staging/wilc1000/wilc_time.c | 163 ------------------------ drivers/staging/wilc1000/wilc_time.h | 205 ------------------------------ 5 files changed, 386 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_time.c delete mode 100644 drivers/staging/wilc1000/wilc_time.h
Quoted 7 lines
Quoted 5 lines
after this patch I am getting:
"WARNING: could not opendrivers/staging/wilc1000/wilc_time.c: No such file or directory"
wilc_timeis mentioned in theMakefile, it should have been removed from there also.Ick, not good.
Sorry about that. I had actually made the same mistake before and fixed it up, but the introduced the bug again and didn't find it during my build testing because 'make' kept picking up the old object files.
Quoted 2 lines
Arnd, I've applied the first 4 patches, but stopped here, can you respin the rest and resend?
Done.
Arnd
PATCH 6/16 staging: wilc1000: remove unused string functions
In reply to Arnd BergmannThe driver provides wrappers for a lot of string operations. Some of them are unused, while others should be replaced with normal kernel functions.
This replaces the unused ones for now, and leaves the other ones for a later cleanup.
--- drivers/staging/wilc1000/wilc_osconfig.h | 2 - drivers/staging/wilc1000/wilc_oswrapper.h | 2 - drivers/staging/wilc1000/wilc_platform.h | 4 - drivers/staging/wilc1000/wilc_strutils.c | 351 ------------------------------ drivers/staging/wilc1000/wilc_strutils.h | 282 ------------------------ 5 files changed, 641 deletions(-)
drivers/staging/wilc1000/wilc_osconfig.h +0 -2
@@ -20,7 +20,6 @@/* #define CONFIG_WILC_MEMORY_POOLS 1 */ /* #define CONFIG_WILC_MEMORY_DEBUG 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ -#define CONFIG_WILC_STRING_UTILS 1#define CONFIG_WILC_MSG_QUEUE_FEATURE /* #define CONFIG_WILC_MSG_QUEUE_IPC_NAME */ /* #define CONFIG_WILC_MSG_QUEUE_TIMEOUT */
@@ -32,5 +31,4 @@/* #define CONFIG_WILC_SOCKET_FEATURE */ /* #define CONFIG_WILC_MATH_OPERATIONS_FEATURE */ /* #define CONFIG_WILC_EXTENDED_FILE_OPERATIONS */ -/* #define CONFIG_WILC_EXTENDED_STRING_OPERATIONS */ /* #define CONFIG_WILC_EXTENDED_TIME_OPERATIONS */
drivers/staging/wilc1000/wilc_oswrapper.h +0 -2
@@ -75,9 +75,7 @@ typedef WILC_Uint16 WILC_WideChar;#endif /* String Utilities */ -#ifdef CONFIG_WILC_STRING_UTILS #include "wilc_strutils.h" -#endif /* Message Queue */ #ifdef CONFIG_WILC_MSG_QUEUE_FEATURE
drivers/staging/wilc1000/wilc_platform.h +0 -4
@@ -50,8 +50,6 @@#error This feature is not supported by this OS#endif -/* CONFIG_WILC_STRING_UTILS is implemented */ -/* CONFIG_WILC_MSG_QUEUE_FEATURE is implemented */ /* remove the following block when implementing its feature */
@@ -87,8 +85,6 @@/* CONFIG_WILC_EXTENDED_FILE_OPERATIONS is implemented */ -/* CONFIG_WILC_EXTENDED_STRING_OPERATIONS is implemented */ -/* CONFIG_WILC_EXTENDED_TIME_OPERATIONS is implemented */ /* remove the following block when implementing its feature */
drivers/staging/wilc1000/wilc_strutils.c +0 -351
378 lines not on this page · raw message
drivers/staging/wilc1000/wilc_strutils.h +0 -282
310 lines not on this page · raw message
Signature · 1 line
2.1.0.rc2
PATCH 7/16 staging: wilc1000: simplify msgqueue code
In reply to Arnd BergmannThe driver contains an abstraction for message queues, with optional unused features, while the driver requires the main feature.
This makes the msgqueue code unconditional as it's required but removes the unused parts.
A later cleanup should remove the entire msgqueue code and replace it with some normal kernel API.
--- drivers/staging/wilc1000/wilc_msgqueue.c | 9 --------- drivers/staging/wilc1000/wilc_msgqueue.h | 30 ------------------------------ drivers/staging/wilc1000/wilc_osconfig.h | 3 --- drivers/staging/wilc1000/wilc_oswrapper.h | 2 -- drivers/staging/wilc1000/wilc_platform.h | 12 ------------ 5 files changed, 56 deletions(-)
drivers/staging/wilc1000/wilc_msgqueue.c +0 -9
@@ -1,8 +1,6 @@#include "wilc_oswrapper.h" #include <linux/spinlock.h> -#ifdef CONFIG_WILC_MSG_QUEUE_FEATURE -/*! * @author syounan
@@ -154,11 +152,6 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,spin_unlock_irqrestore (&pHandle->strCriticalSection, flags);WILC_SemaphoreFillDefault (&strSemAttrs); -#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT -if (pstrAttrs !=WILC_NULL ) { - strSemAttrs.u32TimeOut = pstrAttrs->u32Timeout; - } -#endif s32RetStatus =WILC_SemaphoreAcquire (&(pHandle->hSem), &strSemAttrs);if (s32RetStatus ==WILC_TIMEOUT ) {/* timed out, just exit without consumeing the message */
@@ -207,5 +200,3 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,return s32RetStatus; } - -#endif
drivers/staging/wilc1000/wilc_msgqueue.h +0 -30
@@ -10,10 +10,6 @@* @version 1.0 */ -#ifndef CONFIG_WILC_MSG_QUEUE_FEATURE -#error the feature CONFIG_WILC_MSG_QUEUE_FEATURE must be supported to include this file -#endif -/*! * @struct tstrWILC_MsgQueueAttrs * @brief Message Queue API options
@@ -22,38 +18,12 @@* @version 1.0 */ typedef struct { -#ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME -WILC_Char *pcName; -#endif - -#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT -WILC_Uint32 u32Timeout; -#endif -/* a dummy member to avoid compiler errors*/ WILC_Uint8 dummy; }tstrWILC_MsgQueueAttrs ;/*! -* @brief Fills the MsgQueueAttrs with default parameters -* @param[out] pstrAttrs structure to be filled -* @sa WILC_TimerAttrs -* @author syounan -* @date 30 Aug 2010 -* @version 1.0 -*/ -static void WILC_MsgQueueFillDefault (tstrWILC_MsgQueueAttrs *pstrAttrs) -{ -#ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME - pstrAttrs->pcName =WILC_NULL ; -#endif - -#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT - pstrAttrs->u32Timeout =WILC_OS_INFINITY ; -#endif -} -/*! * @brief Creates a new Message queue * @details Creates a new Message queue, if the feature * CONFIG_WILC_MSG_QUEUE_IPC_NAME is enabled and pstrAttrs->pcName
drivers/staging/wilc1000/wilc_osconfig.h +0 -3
@@ -20,9 +20,6 @@/* #define CONFIG_WILC_MEMORY_POOLS 1 */ /* #define CONFIG_WILC_MEMORY_DEBUG 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ -#define CONFIG_WILC_MSG_QUEUE_FEATURE -/* #define CONFIG_WILC_MSG_QUEUE_IPC_NAME */ -/* #define CONFIG_WILC_MSG_QUEUE_TIMEOUT */ /* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */ /* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */ /* #define CONFIG_WILC_FILE_OPERATIONS_PATH_API */
drivers/staging/wilc1000/wilc_oswrapper.h +0 -2
@@ -78,9 +78,7 @@ typedef WILC_Uint16 WILC_WideChar;#include "wilc_strutils.h" /* Message Queue */ -#ifdef CONFIG_WILC_MSG_QUEUE_FEATURE #include "wilc_msgqueue.h" -#endif /* File operations */ #ifdef CONFIG_WILC_FILE_OPERATIONS_FEATURE
drivers/staging/wilc1000/wilc_platform.h +0 -12
@@ -50,18 +50,6 @@#error This feature is not supported by this OS#endif -/* CONFIG_WILC_MSG_QUEUE_FEATURE is implemented */ - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME -#error This feature is not supported by this OS -#endif - -/* remove the following block when implementing its feature */ -/*#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT -* #error This feature is not supported by this OS -#endif*/ -/* CONFIG_WILC_FILE_OPERATIONS_FEATURE is implemented */ /* CONFIG_WILC_FILE_OPERATIONS_STRING_API is implemented */
Signature · 1 line
2.1.0.rc2
PATCH 8/16 staging: wilc1000: remove unused memory handling code
In reply to Arnd BergmannThe driver contains its own abstraction for memory allocation, most of it unused. This removes the unused parts, but the rest should also be removed later.
--- drivers/staging/wilc1000/wilc_memory.c | 5 -- drivers/staging/wilc1000/wilc_memory.h | 93 ------------------------------- drivers/staging/wilc1000/wilc_osconfig.h | 3 - drivers/staging/wilc1000/wilc_oswrapper.h | 2 - drivers/staging/wilc1000/wilc_platform.h | 13 ----- 5 files changed, 116 deletions(-)
drivers/staging/wilc1000/wilc_memory.c +0 -5
@@ -1,9 +1,6 @@#include "wilc_oswrapper.h" -#ifdef CONFIG_WILC_MEMORY_FEATURE - -/*! * @author syounan * @date 18 Aug 2010
@@ -59,5 +56,3 @@ void WILC_MemoryFree(void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, {kfree (pvBlock); } - -#endif
drivers/staging/wilc1000/wilc_memory.h +0 -93
120 lines not on this page · raw message
drivers/staging/wilc1000/wilc_osconfig.h +0 -3
@@ -16,9 +16,6 @@#define CONFIG_WILC_SLEEP_HI_RES 1#define CONFIG_WILC_TIMER_FEATURE 1/* #define CONFIG_WILC_TIMER_PERIODIC 1 */ -#define CONFIG_WILC_MEMORY_FEATURE 1 -/* #define CONFIG_WILC_MEMORY_POOLS 1 */ -/* #define CONFIG_WILC_MEMORY_DEBUG 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ /* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */ /* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */
drivers/staging/wilc1000/wilc_oswrapper.h +0 -2
@@ -70,9 +70,7 @@ typedef WILC_Uint16 WILC_WideChar;#endif /* Memory support */ -#ifdef CONFIG_WILC_MEMORY_FEATURE #include "wilc_memory.h" -#endif /* String Utilities */ #include "wilc_strutils.h"
drivers/staging/wilc1000/wilc_platform.h +0 -13
@@ -33,18 +33,6 @@/* CONFIG_WILC_TIMER_PERIODIC is implemented */ -/* CONFIG_WILC_MEMORY_FEATURE is implemented */ - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_MEMORY_POOLS -#error This feature is not supported by this OS -#endif - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_MEMORY_DEBUG -#error This feature is not supported by this OS -#endif -/* remove the following block when implementing its feature */ #ifdef CONFIG_WILC_ASSERTION_SUPPORT #error This feature is not supported by this OS
@@ -100,7 +88,6 @@* OS specific types *******************************************************************/ -typedef void *WILC_MemoryPoolHandle ;typedef struct semaphore WILC_SemaphoreHandle ;typedef struct timer_list WILC_TimerHandle ;
Signature · 1 line
2.1.0.rc2
PATCH 9/16 staging: wilc1000: simplify semaphore wrapper
In reply to Arnd BergmannThe driver has its own API for semaphores. This should be replaced with mutexes and completions, but for the moment we can start by removing the obviously unused parts.
--- drivers/staging/wilc1000/wilc_osconfig.h | 1 - drivers/staging/wilc1000/wilc_oswrapper.h | 2 -- drivers/staging/wilc1000/wilc_semaphore.c | 14 -------------- drivers/staging/wilc1000/wilc_semaphore.h | 18 +----------------- 4 files changed, 1 insertion(+), 34 deletions(-)
drivers/staging/wilc1000/wilc_osconfig.h +0 -1
@@ -10,7 +10,6 @@/* OS features supported */ -#define CONFIG_WILC_SEMAPHORE_FEATURE 1/* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */ #define CONFIG_WILC_SLEEP_FEATURE 1#define CONFIG_WILC_SLEEP_HI_RES 1
drivers/staging/wilc1000/wilc_oswrapper.h +0 -2
@@ -55,9 +55,7 @@ typedef WILC_Uint16 WILC_WideChar;#include "wilc_errorsupport.h" /* Semaphore support */ -#ifdef CONFIG_WILC_SEMAPHORE_FEATURE #include "wilc_semaphore.h" -#endif /* Sleep support */ #ifdef CONFIG_WILC_SLEEP_FEATURE
drivers/staging/wilc1000/wilc_semaphore.c +0 -14
@@ -1,7 +1,5 @@#include "wilc_oswrapper.h" -#ifdef CONFIG_WILC_SEMAPHORE_FEATURE -WILC_ErrNo WILC_SemaphoreCreate (WILC_SemaphoreHandle *pHandle,tstrWILC_SemaphoreAttrs *pstrAttrs)
@@ -33,19 +31,9 @@ WILC_ErrNo WILC_SemaphoreAcquire(WILC_SemaphoreHandle *pHandle, {WILC_ErrNo s32RetStatus =WILC_SUCCESS ; -#ifndef CONFIG_WILC_SEMAPHORE_TIMEOUT while (down_interruptible (pHandle)) ; -#else -if (pstrAttrs ==WILC_NULL ) { -down (pHandle); - }else { - - s32RetStatus =down_timeout (pHandle,msecs_to_jiffies (pstrAttrs->u32TimeOut)); - } -#endif -if (s32RetStatus ==0 ) {return WILC_SUCCESS ; }else if (s32RetStatus == -ETIME ) {
@@ -66,5 +54,3 @@ WILC_ErrNo WILC_SemaphoreRelease(WILC_SemaphoreHandle *pHandle,return WILC_SUCCESS ; } - -#endif
drivers/staging/wilc1000/wilc_semaphore.h +1 -17
@@ -10,11 +10,6 @@* @version 1.0 */ - -#ifndef CONFIG_WILC_SEMAPHORE_FEATURE -#error the feature WILC_OS_FEATURE_SEMAPHORE must be supported to include this file -#endif -/*! * @struct WILC_SemaphoreAttrs * @brief Semaphore API options
@@ -28,14 +23,6 @@ typedef struct {*/ WILC_Uint32 u32InitCount; -#ifdef CONFIG_WILC_SEMAPHORE_TIMEOUT -/*!< -* Timeout for use with WILC_SemaphoreAcquire, 0 to return immediately and -* WILC_OS_INFINITY to wait forever. default is WILC_OS_INFINITY -*/ -WILC_Uint32 u32TimeOut; -#endif - } tstrWILC_SemaphoreAttrs;
@@ -47,12 +34,9 @@ typedef struct {* @date 10 Aug 2010 * @version 1.0 */ -static void WILC_SemaphoreFillDefault (tstrWILC_SemaphoreAttrs *pstrAttrs) +static inline void WILC_SemaphoreFillDefault (tstrWILC_SemaphoreAttrs *pstrAttrs) { pstrAttrs->u32InitCount =1 ; -#ifdef CONFIG_WILC_SEMAPHORE_TIMEOUT - pstrAttrs->u32TimeOut =WILC_OS_INFINITY ; -#endif }/*! * @brief Creates a new Semaphore object
Signature · 1 line
2.1.0.rc2
PATCH 10/16 staging: wilc1000: clean up sleep wrapper
In reply to Arnd BergmannThe driver has a simple wrapper around msleep, as well as a more advanced sleep function that is unused. This removes the unused code and the options to turn the feature on or off.
A follow-up should rework the code to use msleep directly.
--- drivers/staging/wilc1000/wilc_osconfig.h | 2 -- drivers/staging/wilc1000/wilc_oswrapper.h | 2 -- drivers/staging/wilc1000/wilc_platform.h | 6 ------ drivers/staging/wilc1000/wilc_sleep.c | 10 ---------- drivers/staging/wilc1000/wilc_sleep.h | 30 +----------------------------- 5 files changed, 1 insertion(+), 49 deletions(-)
drivers/staging/wilc1000/wilc_osconfig.h +0 -2
@@ -11,8 +11,6 @@/* OS features supported */ /* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */ -#define CONFIG_WILC_SLEEP_FEATURE 1 -#define CONFIG_WILC_SLEEP_HI_RES 1#define CONFIG_WILC_TIMER_FEATURE 1/* #define CONFIG_WILC_TIMER_PERIODIC 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */
drivers/staging/wilc1000/wilc_oswrapper.h +0 -2
@@ -58,9 +58,7 @@ typedef WILC_Uint16 WILC_WideChar;#include "wilc_semaphore.h" /* Sleep support */ -#ifdef CONFIG_WILC_SLEEP_FEATURE #include "wilc_sleep.h" -#endif /* Timer support */ #ifdef CONFIG_WILC_TIMER_FEATURE
drivers/staging/wilc1000/wilc_platform.h +0 -6
@@ -22,12 +22,6 @@* #error This feature is not supported by this OS #endif*/ -/* CONFIG_WILC_SLEEP_FEATURE is implemented */ - -/* remove the following block when implementing its feature */ -/* #ifdef CONFIG_WILC_SLEEP_HI_RES */ -/* #error This feature is not supported by this OS */ -/* #endif */ /* CONFIG_WILC_TIMER_FEATURE is implemented */
drivers/staging/wilc1000/wilc_sleep.c +0 -10
@@ -1,8 +1,6 @@#include "wilc_oswrapper.h" -#ifdef CONFIG_WILC_SLEEP_FEATURE -/* * @author mdaftedar * @date 10 Aug 2010
@@ -18,11 +16,3 @@ void WILC_Sleep(WILC_Uint32 u32TimeMilliSec) } } -#endif - -/* #ifdef CONFIG_WILC_SLEEP_HI_RES */ -void WILC_SleepMicrosec (WILC_Uint32 u32TimeMicoSec) -{ -usleep_range (u32TimeMicoSec, u32TimeMicoSec); -} -/* #endif */
drivers/staging/wilc1000/wilc_sleep.h +1 -29
@@ -2,19 +2,6 @@#define __WILC_SLEEP_H__/*! -* @file wilc_sleep.h -* @brief Sleep OS Wrapper functionality -* @author syounan -* @sa wilc_oswrapper.h top level OS wrapper file -* @date 10 Aug 2010 -* @version 1.0 -*/ - -#ifndef CONFIG_WILC_SLEEP_FEATURE -#error the feature WILC_OS_FEATURE_SLEEP must be supported to include this file -#endif - -/*! * @brief forces the current thread to sleep until the given time has elapsed * @param[in] u32TimeMilliSec Time to sleep in Milli seconds * @sa WILC_SleepMicrosec
@@ -24,22 +11,7 @@* @note This function offers a relatively innacurate and low resolution * sleep, for accurate high resolution sleep use u32TimeMicoSec */ +/* TODO: remove and open-code in callers */ void WILC_Sleep (WILC_Uint32 u32TimeMilliSec); -#ifdef CONFIG_WILC_SLEEP_HI_RES -/*! -* @brief forces the current thread to sleep until the given time has elapsed -* @param[in] u32TimeMicoSec Time to sleep in Micro seconds -* @sa WILC_Sleep -* @author syounan -* @date 10 Aug 2010 -* @version 1.0 -* @note This function offers an acurare high resolution sleep, depends on -* the feature WILC_OS_FEATURE_SLEEP_HI_RES and may not be supported -* on all Operating Systems -*/ -void WILC_SleepMicrosec (WILC_Uint32 u32TimeMicoSec); -#endif - -#endif
Signature · 1 line
2.1.0.rc2
PATCH 11/16 staging: wilc1000: clean up timer feature
In reply to Arnd BergmannThe driver has a simple wrapper around timer_list, and an optional but unused feature to make the timer periodic.
This removes support for the periodic timer and simplifies the code around timers.
A follow-up should replace the remaining wrapper with open-coded timers.
--- drivers/staging/wilc1000/wilc_osconfig.h | 2 -- drivers/staging/wilc1000/wilc_oswrapper.h | 2 -- drivers/staging/wilc1000/wilc_platform.h | 4 ---- drivers/staging/wilc1000/wilc_timer.c | 6 ------ drivers/staging/wilc1000/wilc_timer.h | 27 --------------------------- 5 files changed, 41 deletions(-)
drivers/staging/wilc1000/wilc_osconfig.h +0 -2
@@ -11,8 +11,6 @@/* OS features supported */ /* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */ -#define CONFIG_WILC_TIMER_FEATURE 1 -/* #define CONFIG_WILC_TIMER_PERIODIC 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ /* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */ /* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */
drivers/staging/wilc1000/wilc_oswrapper.h +0 -2
@@ -61,9 +61,7 @@ typedef WILC_Uint16 WILC_WideChar;#include "wilc_sleep.h" /* Timer support */ -#ifdef CONFIG_WILC_TIMER_FEATURE #include "wilc_timer.h" -#endif /* Memory support */ #include "wilc_memory.h"
drivers/staging/wilc1000/wilc_platform.h +0 -4
@@ -23,10 +23,6 @@#endif*/ -/* CONFIG_WILC_TIMER_FEATURE is implemented */ - -/* CONFIG_WILC_TIMER_PERIODIC is implemented */ -/* remove the following block when implementing its feature */ #ifdef CONFIG_WILC_ASSERTION_SUPPORT #error This feature is not supported by this OS
drivers/staging/wilc1000/wilc_timer.c +0 -6
@@ -1,10 +1,6 @@#include "wilc_oswrapper.h" -#ifdef CONFIG_WILC_TIMER_FEATURE - - -WILC_ErrNo WILC_TimerCreate (WILC_TimerHandle *pHandle,tpfWILC_TimerFunction pfCallback,tstrWILC_TimerAttrs *pstrAttrs) {
@@ -47,5 +43,3 @@ WILC_ErrNo WILC_TimerStop(WILC_TimerHandle *pHandle,return s32RetStatus; } - -#endif
drivers/staging/wilc1000/wilc_timer.h +0 -27
@@ -10,10 +10,6 @@* @version 1.0 */ -#ifndef CONFIG_WILC_TIMER_FEATURE -#error the feature CONFIG_WILC_TIMER_FEATURE must be supported to include this file -#endif -typedef void (*tpfWILC_TimerFunction )(void *);/*!
@@ -24,34 +20,11 @@ typedef void (*tpfWILC_TimerFunction)(void *);* @version 1.0 */ typedef struct { -/*!< if set to WILC_TRUE the callback function will be called -* periodically. */ -#ifdef CONFIG_WILC_TIMER_PERIODIC -WILC_Bool bPeriodicTimer; -#endif -/* a dummy member to avoid compiler errors*/ WILC_Uint8 dummy; }tstrWILC_TimerAttrs ;/*! -* @brief Fills the WILC_TimerAttrs with default parameters -* @param[out] pstrAttrs structure to be filled -* @sa WILC_TimerAttrs -* @author syounan -* @date 16 Aug 2010 -* @version 1.0 -*/ - -static void WILC_TimerFillDefault (tstrWILC_TimerAttrs *pstrAttrs) -{ -#ifdef CONFIG_WILC_TIMER_PERIODIC - pstrAttrs->bPeriodicTimer =WILC_FALSE ; -#endif -} - - -/*! * @brief Creates a new timer * @details Timers are a useful utility to execute some callback function * in the future.
Signature · 1 line
2.1.0.rc2
PATCH 12/16 staging: wilc1000: remove unused OS abstraction features
In reply to Arnd BergmannAll the remaining features from the OS abstraction layer are not used at all in the driver, so we can just remove the remaining references to them.
--- drivers/staging/wilc1000/wilc_errorsupport.h | 17 ---- drivers/staging/wilc1000/wilc_event.h | 123 --------------------------- drivers/staging/wilc1000/wilc_osconfig.h | 14 --- drivers/staging/wilc1000/wilc_oswrapper.h | 22 ----- drivers/staging/wilc1000/wilc_platform.h | 62 -------------- 5 files changed, 238 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_event.h
drivers/staging/wilc1000/wilc_errorsupport.h +0 -17
@@ -64,21 +64,4 @@ typedef WILC_Sint32 WILC_ErrNo; ERRORHANDLER: \ if (WILC_IS_ERR(__status__)) \ -#ifdef CONFIG_WILC_ASSERTION_SUPPORT - -/** -* @brief prints a diagnostic message and aborts the program -* @param[in] pcExpression The expression that triggered the assertion -* @param[in] pcFileName The name of the current source file. -* @param[in] u32LineNumber The line number in the current source file. -* @warning DO NOT CALL DIRECTLY. USE EQUIVALENT MACRO FUNCTION INSTEAD. -*/ -void WILC_assert_INTERNAL (WILC_Char *pcExpression,WILC_Char *pcFileName,WILC_Uint32 u32LineNumber); - -#define WILC_assert (__expression__) (void)(!!(__expression__) || (WILC_assert_INTERNAL((# __expression__), __WILC_FILE__, __WILC_LINE__), 0)) - -#else -#define WILC_assert (__expression__) ((void)0) -#endif -#endif
drivers/staging/wilc1000/wilc_event.h deleted +0 -123
124 lines not on this page · raw message
drivers/staging/wilc1000/wilc_osconfig.h +0 -14
@@ -7,17 +7,3 @@#define WILC_LOGS_ALL 5#define WILC_LOG_VERBOSITY_LEVEL WILC_LOGS_ALL - -/* OS features supported */ - -/* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */ -/* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ -/* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */ -/* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */ -/* #define CONFIG_WILC_FILE_OPERATIONS_PATH_API */ -/* #define CONFIG_WILC_EVENT_FEATURE */ -/* #define CONFIG_WILC_EVENT_TIMEOUT */ -/* #define CONFIG_WILC_SOCKET_FEATURE */ -/* #define CONFIG_WILC_MATH_OPERATIONS_FEATURE */ -/* #define CONFIG_WILC_EXTENDED_FILE_OPERATIONS */ -/* #define CONFIG_WILC_EXTENDED_TIME_OPERATIONS */
drivers/staging/wilc1000/wilc_oswrapper.h +0 -22
@@ -72,26 +72,4 @@ typedef WILC_Uint16 WILC_WideChar;/* Message Queue */ #include "wilc_msgqueue.h" -/* File operations */ -#ifdef CONFIG_WILC_FILE_OPERATIONS_FEATURE -#include "wilc_fileops.h" -#endif - -/* Event support */ -#ifdef CONFIG_WILC_EVENT_FEATURE -#include "wilc_event.h" -#endif - -/* Socket operations */ -#ifdef CONFIG_WILC_SOCKET_FEATURE -#include "wilc_socket.h" -#endif - -/* Math operations */ -#ifdef CONFIG_WILC_MATH_OPERATIONS_FEATURE -#include "wilc_math.h" -#endif - - -#endif
drivers/staging/wilc1000/wilc_platform.h +0 -62
68 lines not on this page · raw message
Signature · 1 line
2.1.0.rc2
PATCH 13/16 staging: wilc1000: remove EXPORT_SYMTAB
In reply to Arnd BergmannThe EXPORT_SYMTAB symbol has not been used in Linux for a very long time, the driver does not need to set it.
--- drivers/staging/wilc1000/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wilc1000/Makefile +1 -1
@@ -10,7 +10,7 @@ ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \ -DAP_FIRMWARE=\"atmel/wilc1000_ap_fw.bin\" \ -DP2P_CONCURRENCY_FIRMWARE=\"atmel/wilc1000_p2p_fw.bin\" -ccflags-y += -I$(src)/ -DEXPORT_SYMTAB -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 \ +ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 \ -DPLL_WORKAROUND -DCONNECT_DIRECT -DAGING_ALG \ -DWILC_PARSE_SCAN_IN_HOST -DDISABLE_PWRSAVE_AND_SCAN_DURING_IP \ -Wno-unused-function -DUSE_WIRELESS -DWILC_DEBUGFS
Signature · 1 line
2.1.0.rc2
PATCH 14/16 staging: wilc1000: remove semaphore wrapper
In reply to Arnd BergmannThe various semaphore functions all directly translate into sema_init(), down() and up(), so we can just remove the API.
This is a mostly automated conversion using simple sed scripts, plus some manual changes to account for down() returning no error.
As a positive side-effect, down() no longer hangs after receiving a signal, as the original code did by looping around down_interruptible.
The semaphores still need to be turned into mutexes as a follow-up step.
--- drivers/staging/wilc1000/coreconfigurator.c | 29 +--- drivers/staging/wilc1000/fifo_buffer.c | 108 +++++++------- drivers/staging/wilc1000/fifo_buffer.h | 2 +- drivers/staging/wilc1000/host_interface.c | 171 +++++++++------------- drivers/staging/wilc1000/host_interface.h | 16 +- drivers/staging/wilc1000/wilc_msgqueue.c | 32 ++-- drivers/staging/wilc1000/wilc_oswrapper.h | 3 - drivers/staging/wilc1000/wilc_platform.h | 4 +- drivers/staging/wilc1000/wilc_semaphore.c | 56 ------- drivers/staging/wilc1000/wilc_semaphore.h | 99 ------------- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 35 ++--- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- 12 files changed, 160 insertions(+), 399 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_semaphore.c delete mode 100644 drivers/staging/wilc1000/wilc_semaphore.h
drivers/staging/wilc1000/coreconfigurator.c +8 -21
@@ -164,8 +164,8 @@ extern void host_int_ScanCompleteReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32/*****************************************************************************/ /* Global Variables */ /*****************************************************************************/ -static WILC_SemaphoreHandle SemHandleSendPkt; -static WILC_SemaphoreHandle SemHandlePktResp; +static struct semaphore SemHandleSendPkt; +static struct semaphore SemHandlePktResp;static WILC_Sint8 *gps8ConfigPacket;
@@ -672,18 +672,10 @@ INLINE WILC_Uint16 get_asoc_id(WILC_Uint8 *data)WILC_Sint32 CoreConfiguratorInit (void ) {WILC_Sint32 s32Error =WILC_SUCCESS ; -tstrWILC_SemaphoreAttrs strSemSendPktAttrs; -tstrWILC_SemaphoreAttrs strSemPktRespAttrs; -PRINT_D (CORECONFIG_DBG ,"CoreConfiguratorInit() \n" ); -WILC_SemaphoreFillDefault (&strSemSendPktAttrs); - strSemSendPktAttrs.u32InitCount =1 ; -WILC_SemaphoreCreate (&SemHandleSendPkt, &strSemSendPktAttrs); - -WILC_SemaphoreFillDefault (&strSemPktRespAttrs); - strSemPktRespAttrs.u32InitCount =0 ; -WILC_SemaphoreCreate (&SemHandlePktResp, &strSemPktRespAttrs); +sema_init (&SemHandleSendPkt,1 ); +sema_init (&SemHandlePktResp,0 ); gps8ConfigPacket = (WILC_Sint8 *)WILC_MALLOC (MAX_PACKET_BUFF_SIZE );if (gps8ConfigPacket ==NULL ) {
@@ -1931,7 +1923,7 @@ WILC_Sint32 ConfigWaitResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32MaxRespBuif (gstrConfigPktInfo.bRespRequired ==WILC_TRUE ) { -WILC_SemaphoreAcquire (&SemHandlePktResp,WILC_NULL ); +down (&SemHandlePktResp); *ps32BytesRead = gstrConfigPktInfo.s32BytesRead; }
@@ -1964,7 +1956,7 @@ WILC_Sint32 SendConfigPkt(WILC_Uint8 u8Mode, tstrWID *pstrWIDs,WILC_Sint32 s32ConfigPacketLen =0 ;WILC_Sint32 s32RcvdRespLen =0 ; -WILC_SemaphoreAcquire (&SemHandleSendPkt,WILC_NULL ); +down (&SemHandleSendPkt);/*set the packet mode*/ g_oper_mode = u8Mode;
@@ -2019,7 +2011,7 @@ WILC_Sint32 SendConfigPkt(WILC_Uint8 u8Mode, tstrWID *pstrWIDs, End_ConfigPkt: -WILC_SemaphoreRelease (&SemHandleSendPkt,WILC_NULL ); +up (&SemHandleSendPkt);return s32Error; }
@@ -2038,7 +2030,7 @@ WILC_Sint32 ConfigProvideResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32RespLePRINT_ER ("BusProvideResponse() Response greater than the prepared Buffer Size \n" ); } -WILC_SemaphoreRelease (&SemHandlePktResp,WILC_NULL ); +up (&SemHandlePktResp); }return s32Error;
@@ -2107,11 +2099,6 @@ WILC_Sint32 CoreConfiguratorDeInit(void)PRINT_D (CORECONFIG_DBG ,"CoreConfiguratorDeInit() \n" ); - -WILC_SemaphoreDestroy (&SemHandleSendPkt,WILC_NULL ); -WILC_SemaphoreDestroy (&SemHandlePktResp,WILC_NULL ); - -if (gps8ConfigPacket !=NULL ) {WILC_FREE (gps8ConfigPacket);
drivers/staging/wilc1000/fifo_buffer.c +50 -58
144 lines not on this page · raw message
drivers/staging/wilc1000/fifo_buffer.h +1 -1
@@ -10,7 +10,7 @@ typedef struct {WILC_Uint32 u32WriteOffset;WILC_Uint32 u32ReadOffset;WILC_Uint32 u32TotalBytes; -WILC_SemaphoreHandle SemBuffer; +struct semaphore SemBuffer; } tstrFifoHandler;
drivers/staging/wilc1000/host_interface.c +70 -101
516 lines not on this page · raw message
drivers/staging/wilc1000/host_interface.h +8 -8
@@ -422,14 +422,14 @@ typedef struct {WILC_Uint8 au8AssociatedBSSID[ETH_ALEN ];tstrCfgParamVal strCfgValues;/* semaphores */ -WILC_SemaphoreHandle gtOsCfgValuesSem; -WILC_SemaphoreHandle hSemTestKeyBlock; - -WILC_SemaphoreHandle hSemTestDisconnectBlock; -WILC_SemaphoreHandle hSemGetRSSI; -WILC_SemaphoreHandle hSemGetLINKSPEED; -WILC_SemaphoreHandle hSemGetCHNL; -WILC_SemaphoreHandle hSemInactiveTime; +struct semaphore gtOsCfgValuesSem; +struct semaphore hSemTestKeyBlock; + +struct semaphore hSemTestDisconnectBlock; +struct semaphore hSemGetRSSI; +struct semaphore hSemGetLINKSPEED; +struct semaphore hSemGetCHNL; +struct semaphore hSemInactiveTime;/* timer handlers */ WILC_TimerHandle hScanTimer;WILC_TimerHandle hConnectTimer;
drivers/staging/wilc1000/wilc_msgqueue.c +10 -22
@@ -11,21 +11,12 @@WILC_ErrNo WILC_MsgQueueCreate (WILC_MsgQueueHandle *pHandle,tstrWILC_MsgQueueAttrs *pstrAttrs) { -tstrWILC_SemaphoreAttrs strSemAttrs; -WILC_SemaphoreFillDefault (&strSemAttrs); - strSemAttrs.u32InitCount =0 ; -spin_lock_init (&pHandle->strCriticalSection); -if ((WILC_SemaphoreCreate (&pHandle->hSem, &strSemAttrs) ==WILC_SUCCESS )) { - - pHandle->pstrMessageList =NULL ; - pHandle->u32ReceiversCount =0 ; - pHandle->bExiting =WILC_FALSE ; - -return WILC_SUCCESS ; - }else { -return WILC_FAIL ; - } +sema_init (&pHandle->hSem,0 ); + pHandle->pstrMessageList =NULL ; + pHandle->u32ReceiversCount =0 ; + pHandle->bExiting =WILC_FALSE ; +return WILC_SUCCESS ; }/*!
@@ -42,12 +33,10 @@ WILC_ErrNo WILC_MsgQueueDestroy(WILC_MsgQueueHandle *pHandle,/* Release any waiting receiver thread. */ while (pHandle->u32ReceiversCount >0 ) { -WILC_SemaphoreRelease (&(pHandle->hSem),WILC_NULL ); +up (&(pHandle->hSem)); pHandle->u32ReceiversCount--; } -WILC_SemaphoreDestroy (&pHandle->hSem,WILC_NULL ); -while (pHandle->pstrMessageList !=NULL ) {Message *pstrMessge = pHandle->pstrMessageList->pstrNext;WILC_FREE (pHandle->pstrMessageList);
@@ -104,7 +93,7 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,spin_unlock_irqrestore (&pHandle->strCriticalSection, flags); -WILC_SemaphoreRelease (&pHandle->hSem,WILC_NULL ); +up (&pHandle->hSem);WILC_CATCH (s32RetStatus) {
@@ -136,7 +125,6 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,Message *pstrMessage;WILC_ErrNo s32RetStatus =WILC_SUCCESS ; -tstrWILC_SemaphoreAttrs strSemAttrs;unsigned long flags;if ((pHandle ==NULL ) || (u32RecvBufferSize ==0 ) || (pvRecvBuffer ==NULL ) || (pu32ReceivedLength ==NULL )) {
@@ -151,8 +139,8 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, pHandle->u32ReceiversCount++;spin_unlock_irqrestore (&pHandle->strCriticalSection, flags); -WILC_SemaphoreFillDefault (&strSemAttrs); - s32RetStatus =WILC_SemaphoreAcquire (&(pHandle->hSem), &strSemAttrs); +down (&(pHandle->hSem)); +if (s32RetStatus ==WILC_TIMEOUT ) {/* timed out, just exit without consumeing the message */ spin_lock_irqsave (&pHandle->strCriticalSection, flags);
@@ -176,7 +164,7 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,/* check buffer size */ if (u32RecvBufferSize < pstrMessage->u32Length) {spin_unlock_irqrestore (&pHandle->strCriticalSection, flags); -WILC_SemaphoreRelease (&pHandle->hSem,WILC_NULL ); +up (&pHandle->hSem);WILC_ERRORREPORT (s32RetStatus,WILC_BUFFER_OVERFLOW ); }
drivers/staging/wilc1000/wilc_oswrapper.h +0 -3
@@ -54,9 +54,6 @@ typedef WILC_Uint16 WILC_WideChar;/* Error reporting and handling support */ #include "wilc_errorsupport.h" -/* Semaphore support */ -#include "wilc_semaphore.h" -/* Sleep support */ #include "wilc_sleep.h"
drivers/staging/wilc1000/wilc_platform.h +1 -3
@@ -16,8 +16,6 @@* OS specific types *******************************************************************/ -typedef struct semaphore WILC_SemaphoreHandle ; -typedef struct timer_list WILC_TimerHandle ;
@@ -30,7 +28,7 @@ typedef struct __Message_struct { } Message; typedef struct __MessageQueue_struct { - WILC_SemaphoreHandle hSem; + struct semaphore hSem; spinlock_t strCriticalSection; WILC_Bool bExiting; WILC_Uint32 u32ReceiversCount;
drivers/staging/wilc1000/wilc_semaphore.c deleted +0 -56
56 lines not on this page · raw message
drivers/staging/wilc1000/wilc_semaphore.h deleted +0 -99
99 lines not on this page · raw message
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +10 -25
@@ -462,7 +462,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwoPRINT_D (CFG80211_DBG ,"No networks found \n" ); } -WILC_SemaphoreAcquire (&(priv->hSemScanReq),NULL ); +down (&(priv->hSemScanReq));if (priv->pstrScanReq !=WILC_NULL ) {cfg80211_scan_done (priv->pstrScanReq,WILC_FALSE );
@@ -470,12 +470,12 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo priv->bCfgScanning =WILC_FALSE ; priv->pstrScanReq =WILC_NULL ; } -WILC_SemaphoreRelease (&(priv->hSemScanReq),NULL ); +up (&(priv->hSemScanReq)); }/*Aborting any scan operation during mac close*/ else if (enuScanEvent ==SCAN_EVENT_ABORTED ) { -WILC_SemaphoreAcquire (&(priv->hSemScanReq),NULL ); +down (&(priv->hSemScanReq));PRINT_D (CFG80211_DBG ,"Scan Aborted \n" );if (priv->pstrScanReq !=WILC_NULL ) {
@@ -487,7 +487,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo priv->bCfgScanning =WILC_FALSE ; priv->pstrScanReq =WILC_NULL ; } -WILC_SemaphoreRelease (&(priv->hSemScanReq),NULL ); +up (&(priv->hSemScanReq)); } }
@@ -2839,13 +2839,13 @@ static int WILC_WFI_dump_station(struct wiphy *wiphy, struct net_device *dev,STATION_INFO_RX_BYTES |STATION_INFO_RX_PACKETS |STATION_INFO_SIGNAL |STATION_INFO_INACTIVE_TIME ; -WILC_SemaphoreAcquire (&SemHandleUpdateStats,NULL ); +down (&SemHandleUpdateStats); sinfo->inactive_time = priv->netstats.rx_time > priv->netstats.tx_time ?jiffies_to_msecs (jiffies - priv->netstats.tx_time) :jiffies_to_msecs (jiffies - priv->netstats.rx_time); sinfo->rx_bytes = priv->netstats.rx_bytes; sinfo->tx_bytes = priv->netstats.tx_bytes; sinfo->rx_packets = priv->netstats.rx_packets; sinfo->tx_packets = priv->netstats.tx_packets; -WILC_SemaphoreRelease (&SemHandleUpdateStats,NULL ); +up (&SemHandleUpdateStats);#endif return 0 ;
@@ -3767,7 +3767,7 @@ int WILC_WFI_update_stats(struct wiphy *wiphy, u32 pktlen, u8 changed)struct WILC_WFI_priv *priv; priv =wiphy_priv (wiphy); -/* WILC_SemaphoreAcquire(&SemHandleUpdateStats,NULL); */ +/* down(&SemHandleUpdateStats); */ #if 1 switch (changed) {
@@ -3792,7 +3792,7 @@ int WILC_WFI_update_stats(struct wiphy *wiphy, u32 pktlen, u8 changed)default : break; } -/* WILC_SemaphoreRelease(&SemHandleUpdateStats,NULL); */ +/* down(&SemHandleUpdateStats); */ #endif return 0 ; }
@@ -3898,7 +3898,7 @@ struct wireless_dev *WILC_WFI_WiphyRegister(struct net_device *net)/*Return hardware description structure (wiphy)'s priv*/ priv =wdev_priv (wdev); -WILC_SemaphoreCreate (&(priv->SemHandleUpdateStats),NULL ); +sema_init (&(priv->SemHandleUpdateStats),1 );/*Link the wiphy with wireless structure*/ priv->wdev = wdev;
@@ -3991,8 +3991,6 @@ int WILC_WFI_InitHostInt(struct net_device *net)struct WILC_WFI_priv *priv; -tstrWILC_SemaphoreAttrs strSemaphoreAttrs; -PRINT_D (INIT_DBG ,"Host[%p][%p]\n" , net, net->ieee80211_ptr); priv =wdev_priv (net->ieee80211_ptr);if (op_ifcs ==0 ) {
@@ -4007,17 +4005,11 @@ int WILC_WFI_InitHostInt(struct net_device *net)return s32Error; } -WILC_SemaphoreFillDefault (&strSemaphoreAttrs); - -/* /////////////////////////////////////// */ -/* strSemaphoreAttrs.u32InitCount = 0; */ - - priv->gbAutoRateAdjusted =WILC_FALSE ; priv->bInP2PlistenState =WILC_FALSE ; -WILC_SemaphoreCreate (&(priv->hSemScanReq), &strSemaphoreAttrs); +sema_init (&(priv->hSemScanReq),1 ); s32Error =host_int_init (&priv->hWILCWFIDrv);/* s32Error = host_int_init(&priv->hWILCWFIDrv_2); */ if (s32Error) {
@@ -4042,13 +4034,6 @@ int WILC_WFI_DeInitHostInt(struct net_device *net)struct WILC_WFI_priv *priv; priv =wdev_priv (net->ieee80211_ptr); - - - - - -WILC_SemaphoreDestroy (&(priv->hSemScanReq),NULL ); - priv->gbAutoRateAdjusted =WILC_FALSE ; priv->bInP2PlistenState =WILC_FALSE ;
drivers/staging/wilc1000/wilc_wfi_netdevice.h +2 -2
@@ -165,8 +165,8 @@ struct WILC_WFI_priv {struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA ];WILC_Uint8 wilc_groupkey;/* semaphores */ -WILC_SemaphoreHandle SemHandleUpdateStats; -WILC_SemaphoreHandle hSemScanReq; +struct semaphore SemHandleUpdateStats; +struct semaphore hSemScanReq;/* */ WILC_Bool gbAutoRateAdjusted;
Signature · 1 line
2.1.0.rc2
Re: [PATCH 14/16] staging: wilc1000: remove semaphore wrapper
Quoted 15 lines · Arnd Bergmann
The various semaphore functions all directly translate into
sema_init(),down()andup(), so we can just remove the API.This is a mostly automated conversion using simple sed scripts, plus some manual changes to account for
down()returning no error.As a positive side-effect,
down()no longer hangs after receiving a signal, as the original code did by looping arounddown_interruptible.The semaphores still need to be turned into mutexes as a follow-up step.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 16 lines
--- drivers/staging/wilc1000/coreconfigurator.c | 29 +--- drivers/staging/wilc1000/fifo_buffer.c | 108 +++++++------- drivers/staging/wilc1000/fifo_buffer.h | 2 +- drivers/staging/wilc1000/host_interface.c | 171 +++++++++------------- drivers/staging/wilc1000/host_interface.h | 16 +- drivers/staging/wilc1000/wilc_msgqueue.c | 32 ++-- drivers/staging/wilc1000/wilc_oswrapper.h | 3 - drivers/staging/wilc1000/wilc_platform.h | 4 +- drivers/staging/wilc1000/wilc_semaphore.c | 56 ------- drivers/staging/wilc1000/wilc_semaphore.h | 99 ------------- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 35 ++--- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- 12 files changed, 160 insertions(+), 399 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_semaphore.c delete mode 100644 drivers/staging/wilc1000/wilc_semaphore.h
wilc_semaphore still remains in the Makefile.
regards
sudip
PATCH 15/16 staging: wilc1000: fix const cast warnings
In reply to Arnd BergmannThe wilc1000 driver produces a lot of warnings about invalid casts between const and non-const variables. This reworks the code to avoid all those warnings, by marking variables and function arguments const.
A lot of the types use WILC_Uint8, I change them to const u8 for style reasons, as I'm touching them anyway.
--- drivers/staging/wilc1000/host_interface.c | 32 ++++++++++++----------- drivers/staging/wilc1000/host_interface.h | 24 ++++++++--------- drivers/staging/wilc1000/linux_mon.c | 2 +- drivers/staging/wilc1000/wilc_memory.c | 2 +- drivers/staging/wilc1000/wilc_memory.h | 2 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++++----- drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 +- 7 files changed, 39 insertions(+), 37 deletions(-)
drivers/staging/wilc1000/host_interface.c +17 -15
@@ -4912,8 +4912,8 @@ WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Ui* @date 8 March 2012 * @version 1.0 */ -WILC_Sint32 host_int_add_ptk (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *pu8Ptk,WILC_Uint8 u8PtkKeylen, -const WILC_Uint8 *mac_addr,WILC_Uint8 *pu8RxMic,WILC_Uint8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode,WILC_Uint8 u8Idx) +WILC_Sint32 host_int_add_ptk (WILC_WFIDrvHandle hWFIDrv,const u8 *pu8Ptk,WILC_Uint8 u8PtkKeylen, +const u8 *mac_addr,const u8 *pu8RxMic,const u8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode,WILC_Uint8 u8Idx) {WILC_Sint32 s32Error =WILC_SUCCESS ;tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -5014,9 +5014,9 @@ WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Ptk, WILC* @date 8 March 2012 * @version 1.0 */ -WILC_Sint32 host_int_add_rx_gtk (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *pu8RxGtk,WILC_Uint8 u8GtkKeylen, -WILC_Uint8 u8KeyIdx,WILC_Uint32 u32KeyRSClen,WILC_Uint8 *KeyRSC, -WILC_Uint8 *pu8RxMic,WILC_Uint8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode) +WILC_Sint32 host_int_add_rx_gtk (WILC_WFIDrvHandle hWFIDrv,const u8 *pu8RxGtk,WILC_Uint8 u8GtkKeylen, +WILC_Uint8 u8KeyIdx,WILC_Uint32 u32KeyRSClen,const u8 *KeyRSC, +const u8 *pu8RxMic,const u8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode) {WILC_Sint32 s32Error =WILC_SUCCESS ;tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -5531,7 +5531,7 @@ WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p* @version 1.0 */ WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssid, - WILC_Uint8 *pu8ssid, size_t ssidLen, + const u8 *pu8ssid, size_t ssidLen, const WILC_Uint8 *pu8IEs, size_t IEsLen, tWILCpfConnectResult pfConnectResult, void *pvUserArg, WILC_Uint8 u8security, AUTHTYPE_T tenuAuth_type,
@@ -6090,7 +6090,7 @@ WILC_Sint32 host_int_test_set_int_wid(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32* @date * @version 1.0 */ -WILC_Sint32 host_int_get_inactive_time (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *mac,WILC_Uint32 *pu32InactiveTime) +WILC_Sint32 host_int_get_inactive_time (WILC_WFIDrvHandle hWFIDrv,const u8 *mac,WILC_Uint32 *pu32InactiveTime) {WILC_Sint32 s32Error =WILC_SUCCESS ;tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7364,10 +7364,11 @@ WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParamWILC_memcpy (pstrAddStationMsg, pstrStaParams,sizeof (tstrWILC_AddStaParam));if (pstrAddStationMsg->u8NumRates >0 ) { - pstrAddStationMsg->pu8Rates =WILC_MALLOC (pstrAddStationMsg->u8NumRates); -WILC_NULLCHECK (s32Error, pstrAddStationMsg->pu8Rates); +u8 *rates =WILC_MALLOC (pstrAddStationMsg->u8NumRates); +WILC_NULLCHECK (s32Error, rates); -WILC_memcpy (pstrAddStationMsg->pu8Rates, pstrStaParams->pu8Rates, pstrAddStationMsg->u8NumRates); +WILC_memcpy (rates, pstrStaParams->pu8Rates, pstrAddStationMsg->u8NumRates); + pstrAddStationMsg->pu8Rates = rates; }
@@ -7391,7 +7392,7 @@ WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* @date * @version 1.0 */ -WILC_Sint32 host_int_del_station (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *pu8MacAddr) +WILC_Sint32 host_int_del_station (WILC_WFIDrvHandle hWFIDrv,const u8 *pu8MacAddr) {WILC_Sint32 s32Error =WILC_SUCCESS ;tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7437,7 +7438,7 @@ WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8MacAd* @date * @version 1.0 */ -WILC_Sint32 host_int_del_allstation (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 pu8MacAddr[][ETH_ALEN ]) +WILC_Sint32 host_int_del_allstation (WILC_WFIDrvHandle hWFIDrv,u8 pu8MacAddr[][ETH_ALEN ]) {WILC_Sint32 s32Error =WILC_SUCCESS ;tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7523,9 +7524,10 @@ WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParaWILC_memcpy (pstrAddStationMsg, pstrStaParams,sizeof (tstrWILC_AddStaParam));if (pstrAddStationMsg->u8NumRates >0 ) { - pstrAddStationMsg->pu8Rates =WILC_MALLOC (pstrAddStationMsg->u8NumRates); -WILC_memcpy (pstrAddStationMsg->pu8Rates, pstrStaParams->pu8Rates, pstrAddStationMsg->u8NumRates); -WILC_NULLCHECK (s32Error, pstrAddStationMsg->pu8Rates); +u8 *rates =WILC_MALLOC (pstrAddStationMsg->u8NumRates); +WILC_NULLCHECK (s32Error, rates); +WILC_memcpy (rates, pstrStaParams->pu8Rates, pstrAddStationMsg->u8NumRates); + pstrAddStationMsg->pu8Rates = rates; } s32Error =WILC_MsgQueueSend (&gMsgQHostIF, &strHostIFmsg,sizeof (tstrHostIFmsg),WILC_NULL );
drivers/staging/wilc1000/host_interface.h +12 -12
@@ -464,7 +464,7 @@ typedef struct {WILC_Uint8 au8BSSID[ETH_ALEN ];WILC_Uint16 u16AssocID;WILC_Uint8 u8NumRates; -WILC_Uint8 *pu8Rates; +const u8 *pu8Rates;WILC_Bool bIsHTSupported;WILC_Uint16 u16HTCapInfo;WILC_Uint8 u8AmpduParams;
@@ -578,8 +578,8 @@ WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Ui* @date 8 March 2012 * @version 1.0 */ -WILC_Sint32 host_int_add_ptk (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *pu8Ptk,WILC_Uint8 u8PtkKeylen, -const WILC_Uint8 *mac_addr,WILC_Uint8 *pu8RxMic,WILC_Uint8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode,WILC_Uint8 u8Idx); +WILC_Sint32 host_int_add_ptk (WILC_WFIDrvHandle hWFIDrv,const u8 *pu8Ptk,WILC_Uint8 u8PtkKeylen, +const u8 *mac_addr,const u8 *pu8RxMic,const u8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode,WILC_Uint8 u8Idx);/** * @brief host_int_get_inactive_time
@@ -593,7 +593,7 @@ WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Ptk, WILC* @date 15 April 2013 * @version 1.0 */ -WILC_Sint32 host_int_get_inactive_time (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *mac,WILC_Uint32 *pu32InactiveTime); +WILC_Sint32 host_int_get_inactive_time (WILC_WFIDrvHandle hWFIDrv,const u8 *mac,WILC_Uint32 *pu32InactiveTime);/** * @brief adds Rx GTk Key
@@ -611,9 +611,9 @@ WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *ma* @date 8 March 2012 * @version 1.0 */ -WILC_Sint32 host_int_add_rx_gtk (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *pu8RxGtk,WILC_Uint8 u8GtkKeylen, -WILC_Uint8 u8KeyIdx,WILC_Uint32 u32KeyRSClen,WILC_Uint8 *KeyRSC, -WILC_Uint8 *pu8RxMic,WILC_Uint8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode); +WILC_Sint32 host_int_add_rx_gtk (WILC_WFIDrvHandle hWFIDrv,const u8 *pu8RxGtk,WILC_Uint8 u8GtkKeylen, +WILC_Uint8 u8KeyIdx,WILC_Uint32 u32KeyRSClen,const u8 *KeyRSC, +const u8 *pu8RxMic,const u8 *pu8TxMic,WILC_Uint8 mode,WILC_Uint8 u8Ciphermode);/**
@@ -836,7 +836,7 @@ WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p*/ WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssid, - WILC_Uint8 *pu8ssid, size_t ssidLen, + const u8 *pu8ssid, size_t ssidLen, const WILC_Uint8 *pu8IEs, size_t IEsLen, tWILCpfConnectResult pfConnectResult, void *pvUserArg, WILC_Uint8 u8security, AUTHTYPE_T tenuAuth_type,
@@ -1157,7 +1157,7 @@ WILC_Sint32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv);WILC_Sint32 host_int_add_station (WILC_WFIDrvHandle hWFIDrv,tstrWILC_AddStaParam *pstrStaParams);/*! -* @fn WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8* pu8MacAddr) +* @fn WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, const u8* pu8MacAddr) * @brief Deauthenticates clients when group is terminating * @details * @param[in,out] hWFIDrv handle to the wifi driver
@@ -1169,10 +1169,10 @@ WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* @date 09 April 2014 * @version 1.0 Description */ -WILC_Sint32 host_int_del_allstation (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 pu8MacAddr[][ETH_ALEN ]); +WILC_Sint32 host_int_del_allstation (WILC_WFIDrvHandle hWFIDrv,u8 pu8MacAddr[][ETH_ALEN ]);/*! -* @fn WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8* pu8MacAddr) +* @fn WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, u8* pu8MacAddr) * @brief Notifies the firmware with a new deleted station * @details * @param[in,out] hWFIDrv handle to the wifi driver
@@ -1184,7 +1184,7 @@ WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 pu8Mac* @date 15 July 2012 * @version 1.0 Description */ -WILC_Sint32 host_int_del_station (WILC_WFIDrvHandle hWFIDrv,WILC_Uint8 *pu8MacAddr); +WILC_Sint32 host_int_del_station (WILC_WFIDrvHandle hWFIDrv,const u8 *pu8MacAddr);/*! * @fn WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams)
drivers/staging/wilc1000/linux_mon.c +1 -1
@@ -522,7 +522,7 @@ static void WILC_WFI_mon_setup(struct net_device *dev)* @date 12 JUL 2012 * @version 1.0 */ -struct net_device *WILC_WFI_init_mon_interface (char *name,struct net_device *real_dev) +struct net_device *WILC_WFI_init_mon_interface (const char *name,struct net_device *real_dev) {
drivers/staging/wilc1000/wilc_memory.c +1 -1
@@ -51,7 +51,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize,* @date 18 Aug 2010 * @version 1.0 */ -void WILC_MemoryFree (void *pvBlock,tstrWILC_MemoryAttrs *strAttrs, +void WILC_MemoryFree (const void *pvBlock,tstrWILC_MemoryAttrs *strAttrs,WILC_Char *pcFileName,WILC_Uint32 u32LineNo) {kfree (pvBlock);
drivers/staging/wilc1000/wilc_memory.h +1 -1
@@ -113,7 +113,7 @@ void *WILC_MemoryRealloc(void *pvOldBlock, WILC_Uint32 u32NewSize,* @date 16 Aug 2010 * @version 1.0 */ -void WILC_MemoryFree (void *pvBlock,tstrWILC_MemoryAttrs *strAttrs, +void WILC_MemoryFree (const void *pvBlock,tstrWILC_MemoryAttrs *strAttrs,WILC_Char *pcFileName,WILC_Uint32 u32LineNo);/*!
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +6 -6
@@ -1159,8 +1159,8 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 kWILC_Sint32 s32Error =WILC_SUCCESS , KeyLen = params->key_len;WILC_Uint32 i;struct WILC_WFI_priv *priv; -WILC_Uint8 *pu8RxMic =NULL ; -WILC_Uint8 *pu8TxMic =NULL ; +const u8 *pu8RxMic =NULL ; +const u8 *pu8TxMic =NULL ;WILC_Uint8 u8mode =NO_ENCRYPT ;#ifdef WILC_AP_EXTERNAL_MLME WILC_Uint8 u8gmode =NO_ENCRYPT ;
@@ -1662,7 +1662,7 @@ static int WILC_WFI_dump_survey(struct wiphy *wiphy, struct net_device *netdev,extern uint32_t Statisitcs_totalAcks, Statisitcs_DroppedAcks;static int WILC_WFI_get_station (struct wiphy *wiphy,struct net_device *dev, -u8 *mac,struct station_info *sinfo) +const u8 *mac,struct station_info *sinfo) {WILC_Sint32 s32Error =WILC_SUCCESS ;struct WILC_WFI_priv *priv;
@@ -3431,7 +3431,7 @@ static int WILC_WFI_stop_ap(struct wiphy *wiphy, struct net_device *dev)* @version 1.0 */ static int WILC_WFI_add_station (struct wiphy *wiphy,struct net_device *dev, -u8 *mac,struct station_parameters *params) +const u8 *mac,struct station_parameters *params) {WILC_Sint32 s32Error =WILC_SUCCESS ;struct WILC_WFI_priv *priv;
@@ -3518,7 +3518,7 @@ static int WILC_WFI_add_station(struct wiphy *wiphy, struct net_device *dev,static int WILC_WFI_del_station (struct wiphy *wiphy,struct net_device *dev,struct station_del_parameters *params) { -u8 *mac = params->mac; +const u8 *mac = params->mac;WILC_Sint32 s32Error =WILC_SUCCESS ;struct WILC_WFI_priv *priv;perInterface_wlan_t *nic;
@@ -3564,7 +3564,7 @@ static int WILC_WFI_del_station(struct wiphy *wiphy, struct net_device *dev,* @version 1.0 */ static int WILC_WFI_change_station (struct wiphy *wiphy,struct net_device *dev, -u8 *mac,struct station_parameters *params) +const u8 *mac,struct station_parameters *params) {WILC_Sint32 s32Error =WILC_SUCCESS ;struct WILC_WFI_priv *priv;
drivers/staging/wilc1000/wilc_wfi_cfgoperations.h +1 -1
@@ -118,7 +118,7 @@ int WILC_WFI_DeInitHostInt(struct net_device *net);int WILC_WFI_InitHostInt (struct net_device *net);void WILC_WFI_monitor_rx (uint8_t *buff,uint32_t size);int WILC_WFI_deinit_mon_interface (void ); -struct net_device *WILC_WFI_init_mon_interface (char *name,struct net_device *real_dev); +struct net_device *WILC_WFI_init_mon_interface (const char *name,struct net_device *real_dev);#ifdef TCP_ENHANCEMENTS #define TCP_ACK_FILTER_LINK_SPEED_THRESH 54
Signature · 1 line
2.1.0.rc2
PATCH 16/16 staging: wilc1000: fix compiler warnings
In reply to Arnd BergmannThis avoids the remaining warnings that one gets on a normal
build: unused variables, unused labels, and invalid printk format strings.
--- drivers/staging/wilc1000/linux_wlan.c | 8 ++++++-- drivers/staging/wilc1000/linux_wlan_spi.c | 3 --- drivers/staging/wilc1000/wilc_spi.c | 4 ++-- drivers/staging/wilc1000/wilc_wlan.c | 6 ++---- 4 files changed, 10 insertions(+), 11 deletions(-)
drivers/staging/wilc1000/linux_wlan.c +6 -2
@@ -1025,7 +1025,6 @@ int repeat_power_cycle(perInterface_wlan_t *nic);static int linux_wlan_start_firmware (perInterface_wlan_t *nic) { -static int timeout =5 ;int ret =0 ;/* start firmware */ PRINT_D (INIT_DBG ,"Starting Firmware ...\n" );
@@ -1040,6 +1039,7 @@ static int linux_wlan_start_firmware(perInterface_wlan_t *nic) ret =linux_wlan_lock_timeout (&g_linux_wlan->sync_event,5000 );if (ret) {#ifdef COMPLEMENT_BOOT +static int timeout =5 ;if (timeout--) {PRINT_D (INIT_DBG ,"repeat power cycle[%d]" , timeout);
@@ -1675,7 +1675,9 @@ _fail_2:linux_wlan_unlock (&g_linux_wlan->rxq_event);kthread_stop (g_linux_wlan->rxq_thread); +#ifndef TCP_ENHANCEMENTS _fail_1: +#endif #if (RX_BH_TYPE ==RX_BH_KTHREAD )/*De-Initialize 1st thread*/ g_linux_wlan->close =1 ;
@@ -1999,8 +2001,8 @@ _fail_fw_start_: _fail_irq_enable_:#if (definedWILC_SDIO ) && (!definedWILC_SDIO_IRQ_GPIO )disable_sdio_interrupt (); -#endif _fail_irq_init_: +#endif #if (!definedWILC_SDIO ) || (definedWILC_SDIO_IRQ_GPIO )deinit_irq (g_linux_wlan);
@@ -2522,8 +2524,10 @@ void frmw_to_linux(uint8_t *buff, uint32_t size, uint32_t pkt_offset)int stats;unsigned char *buff_to_send =NULL ;struct sk_buff *skb; +#ifndef TCP_ENHANCEMENTS char *pu8UdpBuffer;struct iphdr *ih; +#endif struct net_device *wilc_netdev;perInterface_wlan_t *nic;
drivers/staging/wilc1000/linux_wlan_spi.c +0 -3
@@ -102,9 +102,6 @@ int linux_spi_init(void *vp)if (called ==0 ) { called++; -if (&wilc_bus ==NULL ) { -PRINT_ER ("wilc_bus address is NULL\n" ); - } ret =spi_register_driver (&wilc_bus); }
drivers/staging/wilc1000/wilc_spi.c +2 -2
@@ -1194,10 +1194,10 @@ static int spi_init(wilc_wlan_inp_t *inp, wilc_debug_func func)/* Read failed. Try with CRC off. This might happen when module * is removed but chip isn't reset*/ g_spi.crc_off =1 ; -PRINT_ER ("[wilc spi]: Failed internal read protocol with CRC on, retyring with CRC off...\n" , __LINE__); +PRINT_ER ("[wilc spi]: Failed internal read protocol with CRC on, retyring with CRC off...\n" );if (!spi_internal_read (WILC_SPI_PROTOCOL_OFFSET , ®)) {/* Reaad failed with both CRC on and off, something went bad */ -PRINT_ER ("[wilc spi]: Failed internal read protocol...\n" , __LINE__); +PRINT_ER ("[wilc spi]: Failed internal read protocol...\n" );return 0 ; } }
drivers/staging/wilc1000/wilc_wlan.c +2 -4
@@ -894,8 +894,6 @@ INLINE void chip_wakeup(void)#endif void chip_sleep_manually (WILC_Uint32 u32SleepTime) { -uint32_t val32; -if (genuChipPSstate !=CHIP_WAKEDUP ) {/* chip is already sleeping. Do nothing */ return ;
@@ -2302,7 +2300,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)#else g_wlan.tx_buffer = (uint8_t *)g_wlan.os_func.os_malloc (g_wlan.tx_buffer_size);#endif -PRINT_D (TX_DBG ,"g_wlan.tx_buffer = 0x%x\n" , g_wlan.tx_buffer); +PRINT_D (TX_DBG ,"g_wlan.tx_buffer = %p\n" , g_wlan.tx_buffer);if (g_wlan.tx_buffer ==WILC_NULL ) {/* ENOBUFS 105 */
@@ -2319,7 +2317,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)#else g_wlan.rx_buffer = (uint8_t *)g_wlan.os_func.os_malloc (g_wlan.rx_buffer_size);#endif -PRINT_D (TX_DBG ,"g_wlan.rx_buffer =0x%x\n" , g_wlan.rx_buffer); +PRINT_D (TX_DBG ,"g_wlan.rx_buffer =%p\n" , g_wlan.rx_buffer);if (g_wlan.rx_buffer ==WILC_NULL ) {/* ENOBUFS 105 */ ret =-105 ;
Signature · 1 line
2.1.0.rc2