staging: wilc1000: rename timeout related macros

Rename timeout related macros to have their unit clear from their name.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index e958f9b935cc00bfd0e0e8c0debb94bc6c07b32e..357683461a7753cb6b997b499169aecac3c33376 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -6,8 +6,8 @@
 
 #include "wilc_wfi_netdevice.h"
 
-#define HOST_IF_SCAN_TIMEOUT                    4000
-#define HOST_IF_CONNECT_TIMEOUT                 9500
+#define WILC_HIF_SCAN_TIMEOUT_MS                4000
+#define WILC_HIF_CONNECT_TIMEOUT_MS             9500
 
 #define FALSE_FRMWR_CHANNEL                    100
 
@@ -327,7 +327,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
        hif_drv->usr_scan_req.arg = user_arg;
        hif_drv->scan_timer_vif = vif;
        mod_timer(&hif_drv->scan_timer,
-                 jiffies + msecs_to_jiffies(HOST_IF_SCAN_TIMEOUT));
+                 jiffies + msecs_to_jiffies(WILC_HIF_SCAN_TIMEOUT_MS));
 
 error:
        if (search) {
@@ -1442,7 +1442,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ies,
 
        hif_drv->connect_timer_vif = vif;
        mod_timer(&hif_drv->connect_timer,
-                 jiffies + msecs_to_jiffies(HOST_IF_CONNECT_TIMEOUT));
+                 jiffies + msecs_to_jiffies(WILC_HIF_CONNECT_TIMEOUT_MS));
 
        return 0;
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index cd3df42f45c14dde42501b878107a0b9b78355e2..95230d745e3ba92886b257d91668c76ae80e3441 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -72,7 +72,7 @@ static u8 curr_channel;
 static u8 p2p_oui[] = {0x50, 0x6f, 0x9A, 0x09};
 static u8 p2p_vendor_spec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
 
-#define DURING_IP_TIME_OUT     15000
+#define WILC_IP_TIMEOUT_MS             15000
 
 static void clear_during_ip(struct timer_list *t)
 {
@@ -1489,7 +1489,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
        case NL80211_IFTYPE_P2P_GO:
                vif->obtaining_ip = true;
                mod_timer(&vif->during_ip_timer,
-                         jiffies + msecs_to_jiffies(DURING_IP_TIME_OUT));
+                         jiffies + msecs_to_jiffies(WILC_IP_TIMEOUT_MS));
                wilc_set_operation_mode(vif, WILC_AP_MODE);
                dev->ieee80211_ptr->iftype = type;
                priv->wdev->iftype = type;

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 58bcdc17b37c0deca838918040939b4db9a942df..7a757c9e4a2921d53a31f0fc20372191ed464b8b 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1141,7 +1141,7 @@ int wilc_wlan_cfg_set(struct wilc_vif *vif, int start, u16 wid, u8 *buffer,
                ret_size = 0;
 
        if (!wait_for_completion_timeout(&wilc->cfg_event,
-                                        msecs_to_jiffies(CFG_PKTS_TIMEOUT))) {
+                                        WILC_CFG_PKTS_TIMEOUT)) {
                netdev_dbg(vif->ndev, "%s: Timed Out\n", __func__);
                ret_size = 0;
        }
@@ -1179,7 +1179,7 @@ int wilc_wlan_cfg_get(struct wilc_vif *vif, int start, u16 wid, int commit,
                ret_size = 0;
 
        if (!wait_for_completion_timeout(&wilc->cfg_event,
-                                        msecs_to_jiffies(CFG_PKTS_TIMEOUT))) {
+                                        WILC_CFG_PKTS_TIMEOUT)) {
                netdev_dbg(vif->ndev, "%s: Timed Out\n", __func__);
                ret_size = 0;
        }

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 388045283dd53eca0a9add684e17e7004d16a769..1d61e20c94f3e76ec88fa79325b1dde986353f35 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -196,7 +196,7 @@
 #define ENABLE_RX_VMM          (SEL_VMM_TBL1 | EN_VMM)
 #define ENABLE_TX_VMM          (SEL_VMM_TBL0 | EN_VMM)
 /*time for expiring the completion of cfg packets*/
-#define CFG_PKTS_TIMEOUT       2000
+#define WILC_CFG_PKTS_TIMEOUT  msecs_to_jiffies(2000)
 
 #define IS_MANAGMEMENT         0x100
 #define IS_MANAGMEMENT_CALLBACK        0x080