From 109c4831279d4bb3f1fff885c5dc31132b03296e Mon Sep 17 00:00:00 2001 From: Chaehyun Lim Date: Tue, 22 Sep 2015 18:34:53 +0900 Subject: [PATCH] staging: wilc1000: remove CoreConfiguratorInit This patch removes CoreConfiguratorInit function, which is not doing anything else except printing a PRINT_D message and returing a s32Error. It is also removed the code that is calling this function. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/coreconfigurator.c | 19 ------------------- drivers/staging/wilc1000/coreconfigurator.h | 1 - drivers/staging/wilc1000/host_interface.c | 11 ----------- 3 files changed, 31 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 14e8efc09baa..e563c9bca8c4 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -327,25 +327,6 @@ static inline u16 get_asoc_id(u8 *data) return asoc_id; } -/** - * @brief initializes the Core Configurator - * @details - * @return Error code indicating success/failure - * @note - * @author mabubakr - * @date 1 Mar 2012 - * @version 1.0 - */ - -s32 CoreConfiguratorInit(void) -{ - s32 s32Error = 0; - - PRINT_D(CORECONFIG_DBG, "CoreConfiguratorInit()\n"); - - return s32Error; -} - u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset) { u16 u16index = 0; diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 843906606f5c..88a697beee2d 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -156,7 +156,6 @@ typedef struct wid_site_survey_reslts { } wid_site_survey_reslts_s; #endif -s32 CoreConfiguratorInit(void); s32 CoreConfiguratorDeInit(void); s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs, diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 158d8b898b75..96d7f72d46f1 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -6467,22 +6467,11 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) up(&(pstrWFIDrv->gtOsCfgValuesSem)); /*TODO Code to setup simulation to be removed later*/ - /*Intialize configurator module*/ - s32Error = CoreConfiguratorInit(); - if (s32Error < 0) { - PRINT_ER("Failed to initialize core configurator\n"); - goto _fail_mem_; - } clients_count++; /* increase number of created entities */ return s32Error; - -_fail_mem_: - if (pstrWFIDrv != NULL) - kfree(pstrWFIDrv); - del_timer_sync(&pstrWFIDrv->hRemainOnChannel); _fail_timer_2: up(&(pstrWFIDrv->gtOsCfgValuesSem)); del_timer_sync(&pstrWFIDrv->hConnectTimer); -- 2.30.2