Commit 4aa85772 authored by Tony Cho's avatar Tony Cho Committed by Greg Kroah-Hartman

staging: wilc1000: remove the warnings on unnecessary braces

This patch removes the warnings reported by checkpatch.pl on {} not
necessary for the single statement blocks.
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c844693
...@@ -106,6 +106,7 @@ static int sdio_set_func0_csa_address_byte0(uint32_t adr) ...@@ -106,6 +106,7 @@ static int sdio_set_func0_csa_address_byte0(uint32_t adr)
_fail_: _fail_:
return 0; return 0;
} }
static int sdio_set_func0_block_size(uint32_t block_size) static int sdio_set_func0_block_size(uint32_t block_size)
{ {
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
...@@ -963,24 +964,18 @@ static int sdio_read_int(uint32_t *int_status) ...@@ -963,24 +964,18 @@ static int sdio_read_int(uint32_t *int_status)
cmd.data = 0; cmd.data = 0;
g_sdio.sdio_cmd52(&cmd); g_sdio.sdio_cmd52(&cmd);
if (cmd.data & (1 << 0)) { if (cmd.data & (1 << 0))
tmp |= INT_0; tmp |= INT_0;
} if (cmd.data & (1 << 2))
if (cmd.data & (1 << 2)) {
tmp |= INT_1; tmp |= INT_1;
} if (cmd.data & (1 << 3))
if (cmd.data & (1 << 3)) {
tmp |= INT_2; tmp |= INT_2;
} if (cmd.data & (1 << 4))
if (cmd.data & (1 << 4)) {
tmp |= INT_3; tmp |= INT_3;
} if (cmd.data & (1 << 5))
if (cmd.data & (1 << 5)) {
tmp |= INT_4; tmp |= INT_4;
} if (cmd.data & (1 << 6))
if (cmd.data & (1 << 6)) {
tmp |= INT_5; tmp |= INT_5;
}
{ {
int i; int i;
...@@ -1087,9 +1082,8 @@ static int sdio_clear_int_ext(uint32_t val) ...@@ -1087,9 +1082,8 @@ static int sdio_clear_int_ext(uint32_t val)
break; break;
flags >>= 1; flags >>= 1;
} }
if (!ret) { if (!ret)
goto _fail_; goto _fail_;
}
for (i = g_sdio.nint; i < MAX_NUM_INT; i++) { for (i = g_sdio.nint; i < MAX_NUM_INT; i++) {
if (flags & 1) if (flags & 1)
g_sdio.dPrint(N_ERR, "[wilc sdio]: Unexpected interrupt cleared %d...\n", i); g_sdio.dPrint(N_ERR, "[wilc sdio]: Unexpected interrupt cleared %d...\n", i);
...@@ -1193,9 +1187,8 @@ static int sdio_sync_ext(int nint /* how mant interrupts to enable. */) ...@@ -1193,9 +1187,8 @@ static int sdio_sync_ext(int nint /* how mant interrupts to enable. */)
return 0; return 0;
} }
for (i = 0; (i < 5) && (nint > 0); i++, nint--) { for (i = 0; (i < 5) && (nint > 0); i++, nint--)
reg |= (1 << (27 + i)); reg |= (1 << (27 + i));
}
ret = sdio_write_reg(WILC_INTR_ENABLE, reg); ret = sdio_write_reg(WILC_INTR_ENABLE, reg);
if (!ret) { if (!ret) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed write reg (%08x)...\n", WILC_INTR_ENABLE); g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed write reg (%08x)...\n", WILC_INTR_ENABLE);
...@@ -1208,9 +1201,8 @@ static int sdio_sync_ext(int nint /* how mant interrupts to enable. */) ...@@ -1208,9 +1201,8 @@ static int sdio_sync_ext(int nint /* how mant interrupts to enable. */)
return 0; return 0;
} }
for (i = 0; (i < 3) && (nint > 0); i++, nint--) { for (i = 0; (i < 3) && (nint > 0); i++, nint--)
reg |= (1 << i); reg |= (1 << i);
}
ret = sdio_read_reg(WILC_INTR2_ENABLE, &reg); ret = sdio_read_reg(WILC_INTR2_ENABLE, &reg);
if (!ret) { if (!ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment