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 <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 14e8efc09baa702a08f0aaa20cc88a1489bfae4e..e563c9bca8c47ad48ac3c9eefd9cecd652cb1034 100644 (file)
--- 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 843906606f5c6ffa6cdb0d6a7a925b0a5649c1c3..88a697beee2dfcad741f46490bf4c999e41493ee 100644 (file)
--- 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 158d8b898b7551896276cce6c51ea9535038d957..96d7f72d46f18d7bb99c6ee75591aa5e7230e90d 100644 (file)
--- 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);