Commit 9c844693 authored by Tony Cho's avatar Tony Cho Committed by Greg Kroah-Hartman

staging: wilc1000: remove the warnings on missing blank line

This patch removes the warnings reported by checkpatch.pl on missing a blank
line after declaration.
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 0dff5478
...@@ -168,6 +168,7 @@ static int sdio_clear_int(void) ...@@ -168,6 +168,7 @@ static int sdio_clear_int(void)
#ifndef WILC_SDIO_IRQ_GPIO #ifndef WILC_SDIO_IRQ_GPIO
/* uint32_t sts; */ /* uint32_t sts; */
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
cmd.read_write = 0; cmd.read_write = 0;
cmd.function = 1; cmd.function = 1;
cmd.raw = 0; cmd.raw = 0;
...@@ -179,6 +180,7 @@ static int sdio_clear_int(void) ...@@ -179,6 +180,7 @@ static int sdio_clear_int(void)
return cmd.data; return cmd.data;
#else #else
uint32_t reg; uint32_t reg;
if (!sdio_read_reg(WILC_HOST_RX_CTRL_0, &reg)) { if (!sdio_read_reg(WILC_HOST_RX_CTRL_0, &reg)) {
g_sdio.dPrint(N_ERR, "[wilc spi]: Failed read reg (%08x)...\n", WILC_HOST_RX_CTRL_0); g_sdio.dPrint(N_ERR, "[wilc spi]: Failed read reg (%08x)...\n", WILC_HOST_RX_CTRL_0);
return 0; return 0;
...@@ -195,6 +197,7 @@ uint32_t sdio_xfer_cnt(void) ...@@ -195,6 +197,7 @@ uint32_t sdio_xfer_cnt(void)
{ {
uint32_t cnt = 0; uint32_t cnt = 0;
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
cmd.read_write = 0; cmd.read_write = 0;
cmd.function = 1; cmd.function = 1;
cmd.raw = 0; cmd.raw = 0;
...@@ -259,6 +262,7 @@ static int sdio_write_reg(uint32_t addr, uint32_t data) ...@@ -259,6 +262,7 @@ static int sdio_write_reg(uint32_t addr, uint32_t data)
if ((addr >= 0xf0) && (addr <= 0xff)) { if ((addr >= 0xf0) && (addr <= 0xff)) {
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
cmd.read_write = 1; cmd.read_write = 1;
cmd.function = 0; cmd.function = 0;
cmd.raw = 0; cmd.raw = 0;
...@@ -482,6 +486,7 @@ static int sdio_read_reg(uint32_t addr, uint32_t *data) ...@@ -482,6 +486,7 @@ static int sdio_read_reg(uint32_t addr, uint32_t *data)
{ {
if ((addr >= 0xf0) && (addr <= 0xff)) { if ((addr >= 0xf0) && (addr <= 0xff)) {
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
cmd.read_write = 0; cmd.read_write = 0;
cmd.function = 0; cmd.function = 0;
cmd.raw = 0; cmd.raw = 0;
...@@ -776,6 +781,7 @@ static int sdio_init(wilc_wlan_inp_t *inp, wilc_debug_func func) ...@@ -776,6 +781,7 @@ static int sdio_init(wilc_wlan_inp_t *inp, wilc_debug_func func)
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
int loop; int loop;
uint32_t chipid; uint32_t chipid;
memset(&g_sdio, 0, sizeof(wilc_sdio_t)); memset(&g_sdio, 0, sizeof(wilc_sdio_t));
g_sdio.dPrint = func; g_sdio.dPrint = func;
...@@ -977,6 +983,7 @@ static int sdio_read_int(uint32_t *int_status) ...@@ -977,6 +983,7 @@ static int sdio_read_int(uint32_t *int_status)
} }
{ {
int i; int i;
for (i = g_sdio.nint; i < MAX_NUM_INT; i++) { for (i = g_sdio.nint; i < MAX_NUM_INT; i++) {
if ((tmp >> (IRG_FLAGS_OFFSET + i)) & 0x1) { if ((tmp >> (IRG_FLAGS_OFFSET + i)) & 0x1) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Unexpected interrupt (1) : tmp=%x, data=%x\n", tmp, cmd.data); g_sdio.dPrint(N_ERR, "[wilc sdio]: Unexpected interrupt (1) : tmp=%x, data=%x\n", tmp, cmd.data);
...@@ -1015,6 +1022,7 @@ static int sdio_clear_int_ext(uint32_t val) ...@@ -1015,6 +1022,7 @@ static int sdio_clear_int_ext(uint32_t val)
#ifdef WILC_SDIO_IRQ_GPIO #ifdef WILC_SDIO_IRQ_GPIO
{ {
uint32_t flags; uint32_t flags;
flags = val & ((1 << MAX_NUN_INT_THRPT_ENH2) - 1); flags = val & ((1 << MAX_NUN_INT_THRPT_ENH2) - 1);
reg = flags; reg = flags;
} }
...@@ -1032,6 +1040,7 @@ static int sdio_clear_int_ext(uint32_t val) ...@@ -1032,6 +1040,7 @@ static int sdio_clear_int_ext(uint32_t val)
reg |= (1 << 7); reg |= (1 << 7);
if (reg) { if (reg) {
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
cmd.read_write = 1; cmd.read_write = 1;
cmd.function = 0; cmd.function = 0;
cmd.raw = 0; cmd.raw = 0;
...@@ -1051,6 +1060,7 @@ static int sdio_clear_int_ext(uint32_t val) ...@@ -1051,6 +1060,7 @@ static int sdio_clear_int_ext(uint32_t val)
/* see below. has_thrpt_enh2 uses register 0xf8 to clear interrupts. */ /* see below. has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
/* Cannot clear multiple interrupts. Must clear each interrupt individually */ /* Cannot clear multiple interrupts. Must clear each interrupt individually */
uint32_t flags; uint32_t flags;
flags = val & ((1 << MAX_NUM_INT) - 1); flags = val & ((1 << MAX_NUM_INT) - 1);
if (flags) { if (flags) {
int i; int i;
...@@ -1059,6 +1069,7 @@ static int sdio_clear_int_ext(uint32_t val) ...@@ -1059,6 +1069,7 @@ static int sdio_clear_int_ext(uint32_t val)
for (i = 0; i < g_sdio.nint; i++) { for (i = 0; i < g_sdio.nint; i++) {
if (flags & 1) { if (flags & 1) {
sdio_cmd52_t cmd; sdio_cmd52_t cmd;
cmd.read_write = 1; cmd.read_write = 1;
cmd.function = 0; cmd.function = 0;
cmd.raw = 0; cmd.raw = 0;
......
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