staging: wilc1000: rename WILC_WFI_set_power_mgmt
PATCH v2 1/16 staging: wilc1000: rename WILC_WFI_set_power_mgmt
This patch replaces WILC_WFI_set_power_mgmt with set_power_mgmt. then makes set_power_mgmt static.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +4 -4
@@ -2651,7 +2651,7 @@ static int dump_station(struct wiphy *wiphy, struct net_device *dev,/** -* @brief WILC_WFI_set_power_mgmt +* @brief set_power_mgmt * @details * @param[in] * @return int : Return 0 on Success.
@@ -2659,8 +2659,8 @@ static int dump_station(struct wiphy *wiphy, struct net_device *dev,* @date 01 JUL 2012 * @version 1.0WILC_WFI_set_cqmWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_config_rssi_config */ -int WILC_WFI_set_power_mgmt (struct wiphy *wiphy,struct net_device *dev, -bool enabled,int timeout) +static int set_power_mgmt (struct wiphy *wiphy,struct net_device *dev, +bool enabled,int timeout) {struct wilc_priv *priv;
@@ -3410,7 +3410,7 @@ static struct cfg80211_ops wilc_cfg80211_ops = { .mgmt_tx_cancel_wait = mgmt_tx_cancel_wait, .mgmt_tx = mgmt_tx, .mgmt_frame_register = wilc_mgmt_frame_register, - .set_power_mgmt = WILC_WFI_set_power_mgmt, + .set_power_mgmt = set_power_mgmt, .set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config, };
Signature · 1 line
2.5.1
PATCH v2 2/16 staging: wilc1000: remove useless comment
This patch removes useless comment.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +5 -14
@@ -13,7 +13,7 @@#include "wilc_wfi_cfgoperations.h" #include "wilc_wlan.c" #ifdef WILC_SDIO -#include "linux_wlan_sdio.h" /* tony : for set_wiphy_dev() */ +#include "linux_wlan_sdio.h" #endif #include <linux/errno.h>
@@ -701,10 +701,6 @@ static int set_channel(struct wiphy *wiphy,* @version 1.0 */ -/* -* kernel version 3.8.8 supported -* tony, sswd, WILC-KR, 2013-10-29 -*/ static int scan (struct wiphy *wiphy,struct cfg80211_scan_request *request) {struct wilc_priv *priv;
@@ -1626,11 +1622,6 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev,host_int_get_statistics (priv->hWILCWFIDrv, &strStatistics); -/* -* tony: 2013-11-13 -* tx_failed introduced more than -* kernel version 3.0.0 -*/ sinfo->filled |=BIT (NL80211_STA_INFO_SIGNAL ) |BIT (NL80211_STA_INFO_RX_PACKETS ) | BIT(NL80211_STA_INFO_TX_PACKETS) |
@@ -2657,7 +2648,7 @@ static int dump_station(struct wiphy *wiphy, struct net_device *dev,* @return int : Return 0 on Success. * @author mdaftedar * @date 01 JUL 2012 -* @version 1.0WILC_WFI_set_cqmWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_config_rssi_config +* @version 1.0 */ static int set_power_mgmt (struct wiphy *wiphy,struct net_device *dev,bool enabled,int timeout)
@@ -3371,7 +3362,7 @@ struct wireless_dev *add_virtual_intf(struct wiphy *wiphy, const char *name,* @date 01 JUL 2012 * @version 1.0 */ -int del_virtual_intf (struct wiphy *wiphy,struct wireless_dev *wdev)/* tony for v3.8 support */ +int del_virtual_intf (struct wiphy *wiphy,struct wireless_dev *wdev) {PRINT_D (HOSTAPD_DBG ,"Deleting virtual interface\n" );return 0 ;
@@ -3426,7 +3417,7 @@ static struct cfg80211_ops wilc_cfg80211_ops = {* @return int : Return 0 on Success. * @author mdaftedar * @date 01 MAR 2012 -* @version 1.0WILC_WFI_set_cqmWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_config_rssi_config +* @version 1.0 */ int WILC_WFI_update_stats (struct wiphy *wiphy,u32 pktlen,u8 changed) {
@@ -3573,7 +3564,7 @@ struct wireless_dev *wilc_create_wiphy(struct net_device *net) wdev->wiphy->interface_modes, wdev->iftype);#ifdef WILC_SDIO -set_wiphy_dev (wdev->wiphy, &local_sdio_func->dev);/* tony */ +set_wiphy_dev (wdev->wiphy, &local_sdio_func->dev);#endif /*Register wiphy structure*/
Signature · 1 line
2.5.1
PATCH v2 3/16 staging: wilc1000: rename WILC_WFI_set_cqm_rssi_config
In reply to Chaehyun LimThis patch replaces WILC_WFI_set_cqm_rssi_config with set_cqm_rssi_config to avoid CamelCase.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +4 -4
@@ -2589,7 +2589,7 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev, }/** -* @brief WILC_WFI_set_cqm_rssi_config +* @brief set_cqm_rssi_config * @details Configure connection quality monitor RSSI threshold. * @param[in] struct wiphy *wiphy: * @param[in] struct net_device *dev:
@@ -2600,8 +2600,8 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,* @date 01 MAR 2012 * @version 1.0 */ -static int WILC_WFI_set_cqm_rssi_config (struct wiphy *wiphy, -struct net_device *dev,s32 rssi_thold,u32 rssi_hyst) +static int set_cqm_rssi_config (struct wiphy *wiphy,struct net_device *dev, +s32 rssi_thold,u32 rssi_hyst) {PRINT_D (CFG80211_DBG ,"Setting CQM RSSi Function\n" );return 0 ;
@@ -3402,7 +3402,7 @@ static struct cfg80211_ops wilc_cfg80211_ops = { .mgmt_tx = mgmt_tx, .mgmt_frame_register = wilc_mgmt_frame_register, .set_power_mgmt = set_power_mgmt, - .set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config, + .set_cqm_rssi_config = set_cqm_rssi_config, };
Signature · 1 line
2.5.1
PATCH v2 4/16 staging: wilc1000: make del_virtual_intf static
In reply to Chaehyun LimThis patch makes del_virtual_intf static. This function is used only at wilc_wfi_cfgoperation.c file.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +1 -1
@@ -3362,7 +3362,7 @@ struct wireless_dev *add_virtual_intf(struct wiphy *wiphy, const char *name,* @date 01 JUL 2012 * @version 1.0 */ -int del_virtual_intf (struct wiphy *wiphy,struct wireless_dev *wdev) +static int del_virtual_intf (struct wiphy *wiphy,struct wireless_dev *wdev) {PRINT_D (HOSTAPD_DBG ,"Deleting virtual interface\n" );return 0 ;
Signature · 1 line
2.5.1
PATCH v2 5/16 staging: wilc1000: make mgmt_tx_cancel_wait static
In reply to Chaehyun LimThis patch makes mgmt_tx_cancel_wait static. This function is used only at wilc_wfi_cfgoperation.c file.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +3 -3
@@ -2505,9 +2505,9 @@ int mgmt_tx(struct wiphy *wiphy,return s32Error; } -int mgmt_tx_cancel_wait (struct wiphy *wiphy, -struct wireless_dev *wdev, -u64 cookie) +static int mgmt_tx_cancel_wait (struct wiphy *wiphy, +struct wireless_dev *wdev, +u64 cookie) {struct wilc_priv *priv;tstrWILC_WFIDrv *pstrWFIDrv;
Signature · 1 line
2.5.1
PATCH v2 6/16 staging: wilc1000: make mgmt_tx static
In reply to Chaehyun LimThis patch makes mgmt_tx static. This function is used only at wilc_wfi_cfgoperation.c file.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +4 -4
@@ -2354,10 +2354,10 @@ void WILC_WFI_add_wilcvendorspec(u8 *buff)*/ extern linux_wlan_t *g_linux_wlan;extern bool bEnablePS; -int mgmt_tx (struct wiphy *wiphy, -struct wireless_dev *wdev, -struct cfg80211_mgmt_tx_params *params, -u64 *cookie) +static int mgmt_tx (struct wiphy *wiphy, +struct wireless_dev *wdev, +struct cfg80211_mgmt_tx_params *params, +u64 *cookie) {struct ieee80211_channel *chan = params->chan;unsigned int wait = params->wait;
Signature · 1 line
2.5.1
PATCH v2 7/16 staging: wilc1000: make add_virtual_intf static
In reply to Chaehyun LimThis patch makes add_virtual_intf static. This function is used only at wilc_wfi_cfgoperation.c file.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +6 -4
@@ -3321,10 +3321,12 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,* @date 01 JUL 2012 * @version 1.0 */ -struct wireless_dev *add_virtual_intf (struct wiphy *wiphy,const char *name, -unsigned char name_assign_type, -enum nl80211_iftype type,u32 *flags, -struct vif_params *params) +static struct wireless_dev *add_virtual_intf (struct wiphy *wiphy, +const char *name, +unsigned char name_assign_type, +enum nl80211_iftype type, +u32 *flags, +struct vif_params *params) {perInterface_wlan_t *nic;struct wilc_priv *priv;
Signature · 1 line
2.5.1
PATCH v2 8/16 staging: wilc1000: remove CoreConfiguratorInit
In reply to Chaehyun LimThis 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.
---
v2: rebase latest staging-testing and remove declaration of function.
drivers/staging/wilc1000/coreconfigurator.c | 19 ------------------- drivers/staging/wilc1000/coreconfigurator.h | 1 - drivers/staging/wilc1000/host_interface.c | 11 ----------- 3 files changed, 31 deletions(-)
drivers/staging/wilc1000/coreconfigurator.c +0 -19
@@ -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 ;
drivers/staging/wilc1000/coreconfigurator.h +0 -1
@@ -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,
drivers/staging/wilc1000/host_interface.c +0 -11
@@ -6465,22 +6465,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);
Signature · 1 line
2.5.1
PATCH v2 9/16 staging: wilc1000: host_int_init: remove meaningless comment
In reply to Chaehyun LimThis patch removes meaningless comment in host_int_init function.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/wilc1000/host_interface.c +0 -6
@@ -6378,9 +6378,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) goto _fail_timer_2; }memset (pstrWFIDrv,0 ,sizeof (tstrWILC_WFIDrv)); -/*return driver handle to user*/ *phWFIDrv = pstrWFIDrv; -/*save into globl handle*/ err =add_handler_in_list (pstrWFIDrv);if (err) { s32Error = -EFAULT ;
@@ -6393,7 +6391,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)#endif PRINT_D (HOSTINF_DBG ,"Global handle pointer value=%p\n" , pstrWFIDrv); -/* /////////////////////////////////////// */ if (clients_count ==0 ) {sema_init (&hSemHostIFthrdEnd,0 );sema_init (&hSemDeinitDrvHandle,0 );
@@ -6407,7 +6404,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)sema_init (&(pstrWFIDrv->hSemGetCHNL),0 );sema_init (&(pstrWFIDrv->hSemInactiveTime),0 ); -/* /////////////////////////////////////// */
@@ -6464,8 +6460,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)up (&(pstrWFIDrv->gtOsCfgValuesSem)); -/*TODO Code to setup simulation to be removed later*/ - clients_count++;/* increase number of created entities */ return s32Error;
Signature · 1 line
2.5.1
PATCH v2 10/16 staging: wilc1000: host_int_init: replace kmalloc with kzalloc
In reply to Chaehyun LimThis patch replaces kmalloc with kzalloc in host_int_init.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/wilc1000/host_interface.c +1 -2
@@ -6371,13 +6371,12 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)/*Allocate host interface private structure*/ - pstrWFIDrv =kmalloc (sizeof (tstrWILC_WFIDrv),GFP_KERNEL ); + pstrWFIDrv =kzalloc (sizeof (tstrWILC_WFIDrv),GFP_KERNEL );if (pstrWFIDrv ==NULL ) { s32Error = -ENOMEM ;PRINT_ER ("Failed to allocate memory\n" ); goto _fail_timer_2; } -memset (pstrWFIDrv,0 ,sizeof (tstrWILC_WFIDrv)); *phWFIDrv = pstrWFIDrv; err =add_handler_in_list (pstrWFIDrv);if (err) {
Signature · 1 line
2.5.1
PATCH v2 11/16 staging: wilc1000: host_int_init: fix kzalloc error check
In reply to Chaehyun LimThis patch fixes error check when kzalloc is failed. NULL comparison style is changed to use ! operator and PRINT_ER is also removed.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/wilc1000/host_interface.c +1 -2
@@ -6372,9 +6372,8 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)/*Allocate host interface private structure*/ pstrWFIDrv =kzalloc (sizeof (tstrWILC_WFIDrv),GFP_KERNEL ); -if (pstrWFIDrv ==NULL ) { +if (!pstrWFIDrv) { s32Error = -ENOMEM ; -PRINT_ER ("Failed to allocate memory\n" ); goto _fail_timer_2; } *phWFIDrv = pstrWFIDrv;
Signature · 1 line
2.5.1
PATCH v2 12/16 staging: wilc1000: host_int_init: remove multiple blank lines
In reply to Chaehyun LimThis patch removes multiple blank lines in host_int_init function.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/staging/wilc1000/host_interface.c +0 -8
@@ -6368,8 +6368,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)sema_init (&hWaitResponse,0 ); - -/*Allocate host interface private structure*/ pstrWFIDrv =kzalloc (sizeof (tstrWILC_WFIDrv),GFP_KERNEL );if (!pstrWFIDrv) {
@@ -6402,9 +6400,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)sema_init (&(pstrWFIDrv->hSemGetCHNL),0 );sema_init (&(pstrWFIDrv->hSemInactiveTime),0 ); - - -PRINT_D (HOSTINF_DBG ,"INIT: CLIENT COUNT %d\n" , clients_count);if (clients_count ==0 ) {
@@ -6425,7 +6420,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)mod_timer (&g_hPeriodicRSSI, jiffies +msecs_to_jiffies (5000 )); } -setup_timer (&pstrWFIDrv->hScanTimer, TimerCB_Scan,0 );setup_timer (&pstrWFIDrv->hConnectTimer, TimerCB_Connect,0 );
@@ -6455,7 +6449,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) pstrWFIDrv->strCfgValues.active_scan_time, pstrWFIDrv->strCfgValues.passive_scan_time, pstrWFIDrv->strCfgValues.curr_tx_rate); -up (&(pstrWFIDrv->gtOsCfgValuesSem)); clients_count++;/* increase number of created entities */
@@ -6472,7 +6465,6 @@ _fail_mq_: _fail_:return s32Error; - }/** * @brief host_int_deinit
Signature · 1 line
2.5.1
PATCH v2 13/16 staging: wilc1000: host_int_init: remove commented code
In reply to Chaehyun LimThis patch removes commented code in host_int_init function.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/wilc1000/host_interface.c +0 -1
@@ -6431,7 +6431,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)down (&(pstrWFIDrv->gtOsCfgValuesSem)); pstrWFIDrv->enuHostIFstate =HOST_IF_IDLE ; -/* gWFiDrvHandle->bPendingConnRequest = false; */ /*Initialize CFG WIDS Defualt Values*/
Signature · 1 line
2.5.1
PATCH v2 14/16 staging: wilc1000: host_int_init: replace s32Error with result
In reply to Chaehyun LimThis patch replaces s32Error with result in host_int_init function to avoid camelcase.
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/wilc1000/host_interface.c +8 -8
@@ -6358,7 +6358,7 @@ static u32 clients_count;s32 host_int_init (tstrWILC_WFIDrv **phWFIDrv) { -s32 s32Error =0 ; +s32 result =0 ;tstrWILC_WFIDrv *pstrWFIDrv;int err;
@@ -6371,13 +6371,13 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)/*Allocate host interface private structure*/ pstrWFIDrv =kzalloc (sizeof (tstrWILC_WFIDrv),GFP_KERNEL );if (!pstrWFIDrv) { - s32Error = -ENOMEM ; + result = -ENOMEM ; goto _fail_timer_2; } *phWFIDrv = pstrWFIDrv; err =add_handler_in_list (pstrWFIDrv);if (err) { - s32Error = -EFAULT ; + result = -EFAULT ; goto _fail_timer_2; }
@@ -6403,16 +6403,16 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)PRINT_D (HOSTINF_DBG ,"INIT: CLIENT COUNT %d\n" , clients_count);if (clients_count ==0 ) { - s32Error =wilc_mq_create (&gMsgQHostIF); + result =wilc_mq_create (&gMsgQHostIF); -if (s32Error <0 ) { +if (result <0 ) {PRINT_ER ("Failed to creat MQ\n" ); goto _fail_; } HostIFthreadHandler =kthread_run (hostIFthread,NULL ,"WILC_kthread" );if (IS_ERR (HostIFthreadHandler)) {PRINT_ER ("Failed to creat Thread\n" ); - s32Error = -EFAULT ; + result = -EFAULT ; goto _fail_mq_; } setup_timer(&g_hPeriodicRSSI, GetPeriodicRSSI,
@@ -6452,7 +6452,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) clients_count++;/* increase number of created entities */ -return s32Error; +return result; _fail_timer_2:up (&(pstrWFIDrv->gtOsCfgValuesSem));
@@ -6462,7 +6462,7 @@ _fail_timer_2: _fail_mq_:wilc_mq_destroy (&gMsgQHostIF); _fail_: -return s32Error; +return result; }/**
Signature · 1 line
2.5.1
PATCH v2 15/16 staging: wilc1000: host_int_init: remove blank line before a close brace.
In reply to Chaehyun LimThis patch removes blank line before a close brace.
CHECK: Blank lines aren't necessary before a close brace '}'
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/wilc1000/host_interface.c +0 -1
@@ -6463,7 +6463,6 @@ _fail_mq_:wilc_mq_destroy (&gMsgQHostIF); _fail_:return result; - }/** * @brief host_int_deinit
Signature · 1 line
2.5.1
PATCH v2 16/16 staging: wilc1000: host_int_init: remove unnecessary parentheses
In reply to Chaehyun LimThis patch removes unnecessary parentheses found by checkpatch.pl
Unnecessary parentheses around pstrWFIDrv->hSemTestKeyBlock Unnecessary parentheses around pstrWFIDrv->hSemTestDisconnectBlock Unnecessary parentheses around pstrWFIDrv->hSemGetRSSI Unnecessary parentheses around pstrWFIDrv->hSemGetLINKSPEED Unnecessary parentheses around pstrWFIDrv->hSemGetCHNL Unnecessary parentheses around pstrWFIDrv->hSemInactiveTime Unnecessary parentheses around pstrWFIDrv->gtOsCfgValuesSem Unnecessary parentheses around pstrWFIDrv->gtOsCfgValuesSem
---
v2: rebase latest staging-testing
drivers/staging/wilc1000/host_interface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/wilc1000/host_interface.c +9 -9
@@ -6393,12 +6393,12 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)sema_init (&hSemHostIntDeinit,1 ); } -sema_init (&(pstrWFIDrv->hSemTestKeyBlock),0 ); -sema_init (&(pstrWFIDrv->hSemTestDisconnectBlock),0 ); -sema_init (&(pstrWFIDrv->hSemGetRSSI),0 ); -sema_init (&(pstrWFIDrv->hSemGetLINKSPEED),0 ); -sema_init (&(pstrWFIDrv->hSemGetCHNL),0 ); -sema_init (&(pstrWFIDrv->hSemInactiveTime),0 ); +sema_init (&pstrWFIDrv->hSemTestKeyBlock,0 ); +sema_init (&pstrWFIDrv->hSemTestDisconnectBlock,0 ); +sema_init (&pstrWFIDrv->hSemGetRSSI,0 ); +sema_init (&pstrWFIDrv->hSemGetLINKSPEED,0 ); +sema_init (&pstrWFIDrv->hSemGetCHNL,0 ); +sema_init (&pstrWFIDrv->hSemInactiveTime,0 );PRINT_D (HOSTINF_DBG ,"INIT: CLIENT COUNT %d\n" , clients_count);
@@ -6428,7 +6428,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)setup_timer (&pstrWFIDrv->hRemainOnChannel, ListenTimerCB,0 );sema_init (&(pstrWFIDrv->gtOsCfgValuesSem),1 ); -down (&(pstrWFIDrv->gtOsCfgValuesSem)); +down (&pstrWFIDrv->gtOsCfgValuesSem); pstrWFIDrv->enuHostIFstate =HOST_IF_IDLE ;
@@ -6448,14 +6448,14 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) pstrWFIDrv->strCfgValues.active_scan_time, pstrWFIDrv->strCfgValues.passive_scan_time, pstrWFIDrv->strCfgValues.curr_tx_rate); -up (&(pstrWFIDrv->gtOsCfgValuesSem)); +up (&pstrWFIDrv->gtOsCfgValuesSem); clients_count++;/* increase number of created entities */ return result; _fail_timer_2: -up (&(pstrWFIDrv->gtOsCfgValuesSem)); +up (&pstrWFIDrv->gtOsCfgValuesSem);del_timer_sync (&pstrWFIDrv->hConnectTimer);del_timer_sync (&pstrWFIDrv->hScanTimer);kthread_stop (HostIFthreadHandler);
Signature · 1 line
2.5.1