2016-02-23 12:13:31

by Leo Kim

Subject: [PATCH 1/2] staging: wilc1000: removes unnecessary retry 3 times

This patch removes unnecessary retry 3 times and related variable.
Actually the retry 3 times sentence, don't retry at all.
Repeats conditions are that until read a chip-id and written a register.

Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index d50ddc6..e5a83cc 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -477,7 +477,7 @@ EXPORT_SYMBOL_GPL(chip_allow_sleep);

void chip_wakeup(struct wilc *wilc)
{
- u32 reg, clk_status_reg, trials = 0;
+ u32 reg, clk_status_reg;

if ((wilc->io_type & 0x1) == HIF_SPI) {
do {
@@ -488,8 +488,7 @@ void chip_wakeup(struct wilc *wilc)
do {
usleep_range(2 * 1000, 2 * 1000);
wilc_get_chipid(wilc, true);
- } while ((wilc_get_chipid(wilc, true) == 0) && ((++trials % 3) == 0));
-
+ } while (wilc_get_chipid(wilc, true) == 0);
} while (wilc_get_chipid(wilc, true) == 0);
} else if ((wilc->io_type & 0x1) == HIF_SDIO) {
wilc->hif_func->hif_write_reg(wilc, 0xfa, 1);
@@ -501,7 +500,7 @@ void chip_wakeup(struct wilc *wilc)
wilc->hif_func->hif_read_reg(wilc, 0xf1,
&clk_status_reg);

- while (((clk_status_reg & 0x1) == 0) && (((++trials) % 3) == 0)) {
+ while ((clk_status_reg & 0x1) == 0) {
usleep_range(2 * 1000, 2 * 1000);

wilc->hif_func->hif_read_reg(wilc, 0xf1,
--
1.9.1

2016-02-23 12:13:38

by Leo Kim

Subject: [PATCH 2/2] staging: wilc1000: Revert "staging: wilc1000: remove spaces around '->'"

This reverts commit 6c2ab2398b88 ("staging: wilc1000: remove spaces around '->'").
It had applied from a incorrectly commit a1b56a4c5054
("staging: wilc1000: wilc_wfi_cfgoperations.c: removes unnecessary log messages").

Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a7aa3d2..0fd3a1e 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1928,7 +1928,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,

priv = wiphy_priv(wiphy);
vif = netdev_priv(dev);
- wl = vif ->wilc;
+ wl = vif->wilc;

s32Error = set_channel(wiphy, &settings->chandef);

--
1.9.1