aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2013-07-22 22:17:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-07-24 11:02:09 -0400
commitd00062e318b1e4a4bec8a8e343efe8bc92d3b109 (patch)
treea469ef7b9af008345a8710f15b74e34bc45ded7d
parent2739a95d708c67ff541826f79ef0b2d19320306f (diff)
mwifiex: reduce firmware poll retries
After downloading the firmware, firmware status is checked by reading a register. Polling interval is 100 msecs. Therefore 100 retries means the status is checked for 10 secs which is more than sufficient for firmware to get ready. This patch removes 1000 retries macro usage, because 100secs time is not practical. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwifiex/fw.h3
-rw-r--r--drivers/net/wireless/mwifiex/init.c1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 1b45aa533300..99c27296cbef 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -85,9 +85,6 @@ enum KEY_TYPE_ID {
85#define WAPI_KEY_LEN 50 85#define WAPI_KEY_LEN 50
86 86
87#define MAX_POLL_TRIES 100 87#define MAX_POLL_TRIES 100
88
89#define MAX_MULTI_INTERFACE_POLL_TRIES 1000
90
91#define MAX_FIRMWARE_POLL_TRIES 100 88#define MAX_FIRMWARE_POLL_TRIES 100
92 89
93#define FIRMWARE_READY_SDIO 0xfedc 90#define FIRMWARE_READY_SDIO 0xfedc
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 2ef450e99c75..e4c5ae34c6a8 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -691,7 +691,6 @@ int mwifiex_dnld_fw(struct mwifiex_adapter *adapter,
691 if (!adapter->winner) { 691 if (!adapter->winner) {
692 dev_notice(adapter->dev, 692 dev_notice(adapter->dev,
693 "FW already running! Skip FW dnld\n"); 693 "FW already running! Skip FW dnld\n");
694 poll_num = MAX_MULTI_INTERFACE_POLL_TRIES;
695 goto poll_fw; 694 goto poll_fw;
696 } 695 }
697 } 696 }