]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: removes unnecessary retry 3 times
authorLeo Kim <leo.kim@atmel.com>
Tue, 23 Feb 2016 12:10:53 +0000 (21:10 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Feb 2016 06:29:05 +0000 (22:29 -0800)
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 <leo.kim@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_wlan.c

index d50ddc6683bd49ca7666c5926c2add3803ea543e..e5a83ccdbb49702ac9035ca485d38a40e050c0a4 100644 (file)
@@ -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,