diff options
| author | Michael Straube | 2018-11-29 15:08:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-12-05 09:51:15 +0100 |
| commit | 6bbb77a811085b62056bf3583dbc5d28a319c0cb (patch) | |
| tree | ec5852ad1e4458dec8347bd42eefafe5c1d0346b /drivers/staging/wilc1000 | |
| parent | staging: wilc1000: handle scan operation callback from cfg80211 context (diff) | |
| download | kernel-qcow2-linux-6bbb77a811085b62056bf3583dbc5d28a319c0cb.tar.gz kernel-qcow2-linux-6bbb77a811085b62056bf3583dbc5d28a319c0cb.tar.xz kernel-qcow2-linux-6bbb77a811085b62056bf3583dbc5d28a319c0cb.zip | |
staging: wilc1000: correct inconsistent indenting
Correct inconsistent indenting reported by smatch.
Instead of simply remove indentation, refactor the
loop to also improve readabilitiy.
Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_spi.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 35ff432587fe..153e120eff00 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -927,7 +927,8 @@ static int wilc_spi_read_int(struct wilc *wilc, u32 *int_status) int ret; u32 tmp; u32 byte_cnt; - int happened, j; + bool unexpected_irq; + int j; u32 unknown_mask; u32 irq_flags; int k = IRG_FLAGS_OFFSET + 5; @@ -947,8 +948,6 @@ static int wilc_spi_read_int(struct wilc *wilc, u32 *int_status) j = 0; do { - happened = 0; - wilc_spi_read_reg(wilc, 0x1a90, &irq_flags); tmp |= ((irq_flags >> 27) << IRG_FLAGS_OFFSET); @@ -959,15 +958,15 @@ static int wilc_spi_read_int(struct wilc *wilc, u32 *int_status) unknown_mask = ~((1ul << spi_priv->nint) - 1); - if ((tmp >> IRG_FLAGS_OFFSET) & unknown_mask) { + unexpected_irq = (tmp >> IRG_FLAGS_OFFSET) & unknown_mask; + if (unexpected_irq) { dev_err(&spi->dev, "Unexpected interrupt(2):j=%d,tmp=%x,mask=%x\n", j, tmp, unknown_mask); - happened = 1; } j++; - } while (happened); + } while (unexpected_irq); *int_status = tmp; |