This patch series contains changes to fix line over 80 characters,
too many leading tabs and few other issues reported by checkpatch.pl
script.
Ajay Singh (12):
staging: wilc1000: remove unnecessary comments to avoid line over 80
char issue
staging: wilc1000: fix too many leading tabs warning in
sdio_clear_int_ext()
staging: wilc1000: fix line over 80 characters in sdio_clear_int_ext()
staging: wilc1000: fix open parenthesis alignment mismatch in
wilc_parse_network_info()
staging: wilc1000: fix line over 80 char in wilc_wlan_cfg_set_str()
staging: wilc1000: remove blank line before close brace in
wilc_wlan_cfg_get_wid_value()
staging: wilc1000: fix line over 80 chars in
wilc_wlan_cfg_indicate_rxi()
staging: wilc1000: fix line over 80 chars in
wilc_wlan_cfg_get_wid_value()
staging: wilc1000: fix line over 80 chars in add_tcp_pending_ack()
staging: wilc1000: fix line over 80 characters in tcp_process()
staging: wilc1000: fix line over 80 chars in
wilc_wlan_txq_filter_dup_tcp_ack()
staging: wilc1000: fix line over 80 chars in wilc_wlan_handle_txq()
drivers/staging/wilc1000/coreconfigurator.c | 4 +-
drivers/staging/wilc1000/wilc_sdio.c | 145 ++++++++++++++--------------
drivers/staging/wilc1000/wilc_wlan.c | 70 +++++++++-----
drivers/staging/wilc1000/wilc_wlan_cfg.c | 21 ++--
4 files changed, 134 insertions(+), 106 deletions(-)
--
2.7.4
Hi Ajay,
Sure, I will take a look.
Thank you,
Claudiu
On 21.02.2018 18:25, Ajay Singh wrote:
> Hi Claudiu,
>
> On Mon, 19 Feb 2018 15:33:09 +0200
> Claudiu Beznea <[email protected]> wrote:
>
>> Since you re-factor this, as I suggested in patch:
>> "[PATCH 6/6] staging: wilc1000: fix line over 80 chars in
>> wilc_spi_clear_int_ext()" form your previous series:
>> "fix line over 80 char & coding style in wilc_spi.c",
>> for code starting here:
>
>
> Submitted a new patch "[PATCH 3/4] staging: wilc1000: refactor
> wilc_spi_clear_int_ext() by using GENMASK macro"
> &
> "[PATCH 4/4] staging: wilc1000: refactor sdio_clear_int_ext()
> by using GENMASK macro" which contain changes as suggested.
>
>>
>> and ending here, further improvements could be done. Since the current series
>> was accepted, maybe add these to a todo list and review them later?
>
> For both SPI and SDIO the changes are done. Please review and let me know
> if you any inputs.
>
>
> regards,
> ajay
>
Refactor sdio_clear_int_ext() function to remove "Too many leading tabs"
warning reported by checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_sdio.c | 134 +++++++++++++++++------------------
1 file changed, 65 insertions(+), 69 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 6ce9c94..27ec90e 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -871,6 +871,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
{
struct sdio_func *func = dev_to_sdio_func(wilc->dev);
int ret;
+ int vmm_ctl;
if (g_sdio.has_thrpt_enh3) {
u32 reg;
@@ -909,84 +910,79 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
goto _fail_;
}
}
- } else {
- if (g_sdio.irq_gpio) {
- /* see below. has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
- /* Cannot clear multiple interrupts. Must clear each interrupt individually */
- u32 flags;
-
- flags = val & (BIT(MAX_NUM_INT) - 1);
- if (flags) {
- int i;
-
- ret = 1;
- for (i = 0; i < g_sdio.nint; i++) {
- if (flags & 1) {
- struct sdio_cmd52 cmd;
-
- cmd.read_write = 1;
- cmd.function = 0;
- cmd.raw = 0;
- cmd.address = 0xf8;
- cmd.data = BIT(i);
-
- ret = wilc_sdio_cmd52(wilc, &cmd);
- if (ret) {
- dev_err(&func->dev,
- "Failed cmd52, set 0xf8 data (%d) ...\n",
- __LINE__);
- goto _fail_;
- }
+ return 1;
+ }
+ if (g_sdio.irq_gpio) {
+ /* see below. has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
+ /* Cannot clear multiple interrupts. Must clear each interrupt individually */
+ u32 flags;
+
+ flags = val & (BIT(MAX_NUM_INT) - 1);
+ if (flags) {
+ int i;
+
+ ret = 1;
+ for (i = 0; i < g_sdio.nint; i++) {
+ if (flags & 1) {
+ struct sdio_cmd52 cmd;
+
+ cmd.read_write = 1;
+ cmd.function = 0;
+ cmd.raw = 0;
+ cmd.address = 0xf8;
+ cmd.data = BIT(i);
+
+ ret = wilc_sdio_cmd52(wilc, &cmd);
+ if (ret) {
+ dev_err(&func->dev,
+ "Failed cmd52, set 0xf8 data (%d) ...\n",
+ __LINE__);
+ goto _fail_;
}
- if (!ret)
- break;
- flags >>= 1;
}
if (!ret)
- goto _fail_;
- for (i = g_sdio.nint; i < MAX_NUM_INT; i++) {
- if (flags & 1)
- dev_err(&func->dev,
- "Unexpected interrupt cleared %d...\n",
- i);
- flags >>= 1;
- }
+ break;
+ flags >>= 1;
}
- }
-
- {
- u32 vmm_ctl;
-
- vmm_ctl = 0;
- /* select VMM table 0 */
- if ((val & SEL_VMM_TBL0) == SEL_VMM_TBL0)
- vmm_ctl |= BIT(0);
- /* select VMM table 1 */
- if ((val & SEL_VMM_TBL1) == SEL_VMM_TBL1)
- vmm_ctl |= BIT(1);
- /* enable VMM */
- if ((val & EN_VMM) == EN_VMM)
- vmm_ctl |= BIT(2);
-
- if (vmm_ctl) {
- struct sdio_cmd52 cmd;
-
- cmd.read_write = 1;
- cmd.function = 0;
- cmd.raw = 0;
- cmd.address = 0xf6;
- cmd.data = vmm_ctl;
- ret = wilc_sdio_cmd52(wilc, &cmd);
- if (ret) {
+ if (!ret)
+ goto _fail_;
+ for (i = g_sdio.nint; i < MAX_NUM_INT; i++) {
+ if (flags & 1)
dev_err(&func->dev,
- "Failed cmd52, set 0xf6 data (%d) ...\n",
- __LINE__);
- goto _fail_;
- }
+ "Unexpected interrupt cleared %d...\n",
+ i);
+ flags >>= 1;
}
}
}
+ vmm_ctl = 0;
+ /* select VMM table 0 */
+ if ((val & SEL_VMM_TBL0) == SEL_VMM_TBL0)
+ vmm_ctl |= BIT(0);
+ /* select VMM table 1 */
+ if ((val & SEL_VMM_TBL1) == SEL_VMM_TBL1)
+ vmm_ctl |= BIT(1);
+ /* enable VMM */
+ if ((val & EN_VMM) == EN_VMM)
+ vmm_ctl |= BIT(2);
+
+ if (vmm_ctl) {
+ struct sdio_cmd52 cmd;
+
+ cmd.read_write = 1;
+ cmd.function = 0;
+ cmd.raw = 0;
+ cmd.address = 0xf6;
+ cmd.data = vmm_ctl;
+ ret = wilc_sdio_cmd52(wilc, &cmd);
+ if (ret) {
+ dev_err(&func->dev,
+ "Failed cmd52, set 0xf6 data (%d) ...\n",
+ __LINE__);
+ goto _fail_;
+ }
+ }
return 1;
_fail_:
return 0;
--
2.7.4
Fix "line over 80 characters" issue reported by checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index acaeafc..aedf84d 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -173,11 +173,13 @@ static inline int update_tcp_session(u32 index, u32 ack)
static inline int add_tcp_pending_ack(u32 ack, u32 session_index,
struct txq_entry_t *txqe)
{
- if (pending_base + pending_acks < MAX_PENDING_ACKS) {
- pending_acks_info[pending_base + pending_acks].ack_num = ack;
- pending_acks_info[pending_base + pending_acks].txqe = txqe;
- pending_acks_info[pending_base + pending_acks].session_index = session_index;
- txqe->tcp_pending_ack_idx = pending_base + pending_acks;
+ u32 i = pending_base + pending_acks;
+
+ if (i < MAX_PENDING_ACKS) {
+ pending_acks_info[i].ack_num = ack;
+ pending_acks_info[i].txqe = txqe;
+ pending_acks_info[i].session_index = session_index;
+ txqe->tcp_pending_ack_idx = i;
pending_acks++;
}
return 0;
--
2.7.4
Fix "line over 80 characters" issue reported by checkpatch.pl script by
removing unnecessary comments.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_sdio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index bb65b37..6ce9c94 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -405,7 +405,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
cmd.increment = 1;
cmd.count = 4;
cmd.buffer = (u8 *)&data;
- cmd.block_size = g_sdio.block_size; /* johnny : prevent it from setting unexpected value */
+ cmd.block_size = g_sdio.block_size;
ret = wilc_sdio_cmd53(wilc, &cmd);
if (ret) {
dev_err(&func->dev,
@@ -489,7 +489,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.count = nleft;
cmd.buffer = buf;
- cmd.block_size = block_size; /* johnny : prevent it from setting unexpected value */
+ cmd.block_size = block_size;
if (addr > 0) {
if (!sdio_set_func0_csa_address(wilc, addr))
@@ -543,7 +543,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
cmd.count = 4;
cmd.buffer = (u8 *)data;
- cmd.block_size = g_sdio.block_size; /* johnny : prevent it from setting unexpected value */
+ cmd.block_size = g_sdio.block_size;
ret = wilc_sdio_cmd53(wilc, &cmd);
if (ret) {
dev_err(&func->dev,
@@ -629,7 +629,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.count = nleft;
cmd.buffer = buf;
- cmd.block_size = block_size; /* johnny : prevent it from setting unexpected value */
+ cmd.block_size = block_size;
if (addr > 0) {
if (!sdio_set_func0_csa_address(wilc, addr))
--
2.7.4
Fix "line over 80 character" issue found by checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan_cfg.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index ab69bac..2b44f4c 100644
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -484,15 +484,17 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
} while (1);
} else if (type == CFG_STR_CMD) {
do {
- if (g_cfg_str[i].id == WID_NIL)
+ u32 id = g_cfg_str[i].id;
+
+ if (id == WID_NIL)
break;
- if (g_cfg_str[i].id == wid) {
+ if (id == wid) {
u32 size = g_cfg_str[i].str[0] |
(g_cfg_str[i].str[1] << 8);
if (buffer_size >= size) {
- if (g_cfg_str[i].id == WID_SITE_SURVEY_RESULTS) {
+ if (id == WID_SITE_SURVEY_RESULTS) {
static int toggle;
i += toggle;
--
2.7.4
Hi Ajay,
On 16.02.2018 17:11, Ajay Singh wrote:
> Refactor sdio_clear_int_ext() function to remove "Too many leading tabs"
> warning reported by checkpatch.pl script.
>
> Signed-off-by: Ajay Singh <[email protected]>
> ---
> drivers/staging/wilc1000/wilc_sdio.c | 134 +++++++++++++++++------------------
> 1 file changed, 65 insertions(+), 69 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
> index 6ce9c94..27ec90e 100644
> --- a/drivers/staging/wilc1000/wilc_sdio.c
> +++ b/drivers/staging/wilc1000/wilc_sdio.c
> @@ -871,6 +871,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
> {
> struct sdio_func *func = dev_to_sdio_func(wilc->dev);
> int ret;
> + int vmm_ctl;
>
> if (g_sdio.has_thrpt_enh3) {
> u32 reg;
> @@ -909,84 +910,79 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
> goto _fail_;
> }
> }
> - } else {
> - if (g_sdio.irq_gpio) {
> - /* see below. has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
> - /* Cannot clear multiple interrupts. Must clear each interrupt individually */
> - u32 flags;
> -
> - flags = val & (BIT(MAX_NUM_INT) - 1);
> - if (flags) {
> - int i;
> -
> - ret = 1;
> - for (i = 0; i < g_sdio.nint; i++) {
> - if (flags & 1) {
> - struct sdio_cmd52 cmd;
> -
> - cmd.read_write = 1;
> - cmd.function = 0;
> - cmd.raw = 0;
> - cmd.address = 0xf8;
> - cmd.data = BIT(i);
> -
> - ret = wilc_sdio_cmd52(wilc, &cmd);
> - if (ret) {
> - dev_err(&func->dev,
> - "Failed cmd52, set 0xf8 data (%d) ...\n",
> - __LINE__);
> - goto _fail_;
> - }
> + return 1;
> + }> + if (g_sdio.irq_gpio) {
Since you re-factor this, as I suggested in patch:
"[PATCH 6/6] staging: wilc1000: fix line over 80 chars in
wilc_spi_clear_int_ext()" form your previous series:
"fix line over 80 char & coding style in wilc_spi.c",
for code starting here:
> + /* see below. has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
> + /* Cannot clear multiple interrupts. Must clear each interrupt individually */
> + u32 flags;
> +
> + flags = val & (BIT(MAX_NUM_INT) - 1);
> + if (flags) {
> + int i;
> +
> + ret = 1;
> + for (i = 0; i < g_sdio.nint; i++) {
> + if (flags & 1) {
> + struct sdio_cmd52 cmd;
> +
> + cmd.read_write = 1;
> + cmd.function = 0;
> + cmd.raw = 0;
> + cmd.address = 0xf8;
> + cmd.data = BIT(i);
> +
> + ret = wilc_sdio_cmd52(wilc, &cmd);
> + if (ret) {
> + dev_err(&func->dev,
> + "Failed cmd52, set 0xf8 data (%d) ...\n",
> + __LINE__);
> + goto _fail_;
> }
> - if (!ret)
> - break;
> - flags >>= 1;
> }
> if (!ret)
> - goto _fail_;
> - for (i = g_sdio.nint; i < MAX_NUM_INT; i++) {
> - if (flags & 1)
> - dev_err(&func->dev,
> - "Unexpected interrupt cleared %d...\n",
> - i);
> - flags >>= 1;
> - }
> + break;
> + flags >>= 1;
> }
and ending here, further improvements could be done. Since the current series
was accepted, maybe add these to a todo list and review them later?
> - }
> -
> - {
> - u32 vmm_ctl;
> -
> - vmm_ctl = 0;
> - /* select VMM table 0 */
> - if ((val & SEL_VMM_TBL0) == SEL_VMM_TBL0)
> - vmm_ctl |= BIT(0);
> - /* select VMM table 1 */
> - if ((val & SEL_VMM_TBL1) == SEL_VMM_TBL1)
> - vmm_ctl |= BIT(1);
> - /* enable VMM */
> - if ((val & EN_VMM) == EN_VMM)
> - vmm_ctl |= BIT(2);
> -
> - if (vmm_ctl) {
> - struct sdio_cmd52 cmd;
> -
> - cmd.read_write = 1;
> - cmd.function = 0;
> - cmd.raw = 0;
> - cmd.address = 0xf6;
> - cmd.data = vmm_ctl;
> - ret = wilc_sdio_cmd52(wilc, &cmd);
> - if (ret) {
> + if (!ret)
> + goto _fail_;
> + for (i = g_sdio.nint; i < MAX_NUM_INT; i++) {
> + if (flags & 1)
> dev_err(&func->dev,
> - "Failed cmd52, set 0xf6 data (%d) ...\n",
> - __LINE__);
> - goto _fail_;
> - }
> + "Unexpected interrupt cleared %d...\n",
> + i);
> + flags >>= 1;
> }
> }
> }
>
> + vmm_ctl = 0;
> + /* select VMM table 0 */
> + if ((val & SEL_VMM_TBL0) == SEL_VMM_TBL0)
> + vmm_ctl |= BIT(0);
> + /* select VMM table 1 */
> + if ((val & SEL_VMM_TBL1) == SEL_VMM_TBL1)
> + vmm_ctl |= BIT(1);
> + /* enable VMM */
> + if ((val & EN_VMM) == EN_VMM)
> + vmm_ctl |= BIT(2);
> +
> + if (vmm_ctl) {
> + struct sdio_cmd52 cmd;
> +
> + cmd.read_write = 1;
> + cmd.function = 0;
> + cmd.raw = 0;
> + cmd.address = 0xf6;
> + cmd.data = vmm_ctl;
> + ret = wilc_sdio_cmd52(wilc, &cmd);
> + if (ret) {
> + dev_err(&func->dev,
> + "Failed cmd52, set 0xf6 data (%d) ...\n",
> + __LINE__);
> + goto _fail_;
> + }
> + }
> return 1;
> _fail_:
> return 0;
>
Fix "line over 80 characters" issue reported by checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan.c | 38 +++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 98cd949..1a9ef1a 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -576,6 +576,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
u32 vmm_table[WILC_VMM_TBL_SIZE];
struct wilc_vif *vif;
struct wilc *wilc;
+ const struct wilc_hif_func *func;
vif = netdev_priv(dev);
wilc = vif->wilc;
@@ -629,10 +630,9 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
acquire_bus(wilc, ACQUIRE_AND_WAKEUP);
counter = 0;
+ func = wilc->hif_func;
do {
- ret = wilc->hif_func->hif_read_reg(wilc,
- WILC_HOST_TX_CTRL,
- ®);
+ ret = func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, ®);
if (!ret)
break;
@@ -642,7 +642,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
counter++;
if (counter > 200) {
counter = 0;
- ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_TX_CTRL, 0);
+ ret = func->hif_write_reg(wilc,
+ WILC_HOST_TX_CTRL, 0);
break;
}
} while (!wilc->quit);
@@ -652,18 +653,21 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
timeout = 200;
do {
- ret = wilc->hif_func->hif_block_tx(wilc, WILC_VMM_TBL_RX_SHADOW_BASE, (u8 *)vmm_table, ((i + 1) * 4));
+ ret = func->hif_block_tx(wilc,
+ WILC_VMM_TBL_RX_SHADOW_BASE,
+ (u8 *)vmm_table,
+ ((i + 1) * 4));
if (!ret)
break;
- ret = wilc->hif_func->hif_write_reg(wilc,
- WILC_HOST_VMM_CTL,
- 0x2);
+ ret = func->hif_write_reg(wilc, WILC_HOST_VMM_CTL, 0x2);
if (!ret)
break;
do {
- ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_VMM_CTL, ®);
+ ret = func->hif_read_reg(wilc,
+ WILC_HOST_VMM_CTL,
+ ®);
if (!ret)
break;
if ((reg >> 2) & 0x1) {
@@ -673,7 +677,9 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
release_bus(wilc, RELEASE_ALLOW_SLEEP);
} while (--timeout);
if (timeout <= 0) {
- ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_VMM_CTL, 0x0);
+ ret = func->hif_write_reg(wilc,
+ WILC_HOST_VMM_CTL,
+ 0x0);
break;
}
@@ -681,11 +687,15 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
break;
if (entries == 0) {
- ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, ®);
+ ret = func->hif_read_reg(wilc,
+ WILC_HOST_TX_CTRL,
+ ®);
if (!ret)
break;
reg &= ~BIT(0);
- ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_TX_CTRL, reg);
+ ret = func->hif_write_reg(wilc,
+ WILC_HOST_TX_CTRL,
+ reg);
if (!ret)
break;
break;
@@ -753,11 +763,11 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
acquire_bus(wilc, ACQUIRE_AND_WAKEUP);
- ret = wilc->hif_func->hif_clear_int_ext(wilc, ENABLE_TX_VMM);
+ ret = func->hif_clear_int_ext(wilc, ENABLE_TX_VMM);
if (!ret)
goto _end_;
- ret = wilc->hif_func->hif_block_tx_ext(wilc, 0, txb, offset);
+ ret = func->hif_block_tx_ext(wilc, 0, txb, offset);
if (!ret)
goto _end_;
--
2.7.4
On 16.02.2018 17:11, Ajay Singh wrote:
> Fix "line over 80 characters" issue reported by checkpatch.pl.
> Use temporary variable to avoid checkpatch.pl issue.
>
> Signed-off-by: Ajay Singh <[email protected]>
> ---
> drivers/staging/wilc1000/wilc_wlan.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
> index 391ecd5..98cd949 100644
> --- a/drivers/staging/wilc1000/wilc_wlan.c
> +++ b/drivers/staging/wilc1000/wilc_wlan.c
> @@ -262,10 +262,20 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev)
>
> spin_lock_irqsave(&wilc->txq_spinlock, wilc->txq_spinlock_flags);
> for (i = pending_base; i < (pending_base + pending_acks); i++) {
> - if (i >= MAX_PENDING_ACKS ||
> - pending_acks_info[i].session_index >= 2 * MAX_TCP_SESSION)
> + u32 session_index;
> + u32 bigger_ack_num;
> +
> + if (i >= MAX_PENDING_ACKS)
i >= MAX_PENDINGS_ACKS could be inserted in conditional part of for:
for (i = pending_base; i < (pending_base + pending_acks) &&
i < MAX_PENDINGS_ACKS; i++)
or:
int maxcnt = (pending_base + pending_acks > MAX_PENDINGS_ACKS) ? pending_base +
pending_ack : MAX_PENDINGS_ACKS;
for (i = pending_base; i < maxcnt; i++) {
// ...
}
> + break;
> +
> + session_index = pending_acks_info[i].session_index;
> +
> + if (session_index >= 2 * MAX_TCP_SESSION)
> break;
> - if (pending_acks_info[i].ack_num < ack_session_info[pending_acks_info[i].session_index].bigger_ack_num) {
> +
> + bigger_ack_num = ack_session_info[session_index].bigger_ack_num;
> +
> + if (pending_acks_info[i].ack_num < bigger_ack_num) {
> struct txq_entry_t *tqe;
>
> tqe = pending_acks_info[i].txqe;
>
On Fri, Feb 16, 2018 at 08:41:41PM +0530, Ajay Singh wrote:
> Fix "Alignment should match open parenthesis" issue found by
> checkpatch.pl script.
>
> Signed-off-by: Ajay Singh <[email protected]>
> ---
> drivers/staging/wilc1000/coreconfigurator.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
> index e98fc8e..2e2187b 100644
> --- a/drivers/staging/wilc1000/coreconfigurator.c
> +++ b/drivers/staging/wilc1000/coreconfigurator.c
> @@ -320,8 +320,8 @@ s32 wilc_parse_network_info(u8 *msg_buffer,
> get_ssid(msa, network_info->ssid, &network_info->ssid_len);
> get_BSSID(msa, network_info->bssid);
>
> - network_info->ch = get_current_channel_802_11n(msa,
> - rx_len + FCS_LEN);
> + network_info->ch = get_current_channel_802_11n(msa, rx_len
> + + FCS_LEN);
Greg has already applied this which is fine, but I probably would have
left this as is. Normally a rule is that the '+' character should be on
the first line, and also it's slightly easier to read when the argument
is one one line instead of split across two.
But it doesn't matter much either way. We'll probably end up
re-writing great swaths of this code.
regards,
dan carpenter
Fix "line over 80 characters" issue reported by checkpatch.pl.
Use temporary variable to avoid checkpatch.pl issue.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 391ecd5..98cd949 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -262,10 +262,20 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev)
spin_lock_irqsave(&wilc->txq_spinlock, wilc->txq_spinlock_flags);
for (i = pending_base; i < (pending_base + pending_acks); i++) {
- if (i >= MAX_PENDING_ACKS ||
- pending_acks_info[i].session_index >= 2 * MAX_TCP_SESSION)
+ u32 session_index;
+ u32 bigger_ack_num;
+
+ if (i >= MAX_PENDING_ACKS)
+ break;
+
+ session_index = pending_acks_info[i].session_index;
+
+ if (session_index >= 2 * MAX_TCP_SESSION)
break;
- if (pending_acks_info[i].ack_num < ack_session_info[pending_acks_info[i].session_index].bigger_ack_num) {
+
+ bigger_ack_num = ack_session_info[session_index].bigger_ack_num;
+
+ if (pending_acks_info[i].ack_num < bigger_ack_num) {
struct txq_entry_t *tqe;
tqe = pending_acks_info[i].txqe;
--
2.7.4
Fix "Alignment should match open parenthesis" issue found by
checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index e98fc8e..2e2187b 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -320,8 +320,8 @@ s32 wilc_parse_network_info(u8 *msg_buffer,
get_ssid(msa, network_info->ssid, &network_info->ssid_len);
get_BSSID(msa, network_info->bssid);
- network_info->ch = get_current_channel_802_11n(msa,
- rx_len + FCS_LEN);
+ network_info->ch = get_current_channel_802_11n(msa, rx_len
+ + FCS_LEN);
index = MAC_HDR_LEN + TIME_STAMP_LEN;
--
2.7.4
On Fri, Feb 16, 2018 at 08:41:37PM +0530, Ajay Singh wrote:
> This patch series contains changes to fix line over 80 characters,
> too many leading tabs and few other issues reported by checkpatch.pl
> script.
Please put the proper prefix on your 00/XX patches, that are with your
other patches. Otherwise it can get lost in my patch queues...
thanks,
greg k-h
Cleanup patch to fix "line over 80 characters" issue reported by
checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan_cfg.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index 752b292..ab69bac 100644
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -523,9 +523,12 @@ int wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size,
frame += 4;
size -= 4;
- /**
- * The valid types of response messages are 'R' (Response), 'I' (Information), and 'N' (Network Information)
- **/
+ /*
+ * The valid types of response messages are
+ * 'R' (Response),
+ * 'I' (Information), and
+ * 'N' (Network Information)
+ */
switch (msg_type) {
case 'R':
--
2.7.4
Fix "line over 80 characters" issue found by checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan_cfg.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index aeb5417..c4b3d8d 100644
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -221,7 +221,8 @@ static int wilc_wlan_cfg_set_word(u8 *frame, u32 offset, u16 id, u32 val32)
return 8;
}
-static int wilc_wlan_cfg_set_str(u8 *frame, u32 offset, u16 id, u8 *str, u32 size)
+static int wilc_wlan_cfg_set_str(u8 *frame, u32 offset, u16 id, u8 *str,
+ u32 size)
{
u8 *buf;
--
2.7.4
Cleanup patch to remove "Blank lines aren't necessary before a close
brace '}'" issue reported by checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan_cfg.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index c4b3d8d..752b292 100644
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -497,7 +497,6 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
i += toggle;
toggle ^= 1;
-
}
memcpy(buffer, &g_cfg_str[i].str[2],
size);
--
2.7.4
Hi Claudiu,
On Mon, 19 Feb 2018 15:33:09 +0200
Claudiu Beznea <[email protected]> wrote:
> Since you re-factor this, as I suggested in patch:
> "[PATCH 6/6] staging: wilc1000: fix line over 80 chars in
> wilc_spi_clear_int_ext()" form your previous series:
> "fix line over 80 char & coding style in wilc_spi.c",
> for code starting here:
Submitted a new patch "[PATCH 3/4] staging: wilc1000: refactor
wilc_spi_clear_int_ext() by using GENMASK macro"
&
"[PATCH 4/4] staging: wilc1000: refactor sdio_clear_int_ext()
by using GENMASK macro" which contain changes as suggested.
>
> and ending here, further improvements could be done. Since the current series
> was accepted, maybe add these to a todo list and review them later?
For both SPI and SDIO the changes are done. Please review and let me know
if you any inputs.
regards,
ajay
Fix "line over 80 characters" issue found by checkpatch.pl script.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_wlan.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index aedf84d..391ecd5 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -232,8 +232,10 @@ static inline void tcp_process(struct net_device *dev, struct txq_entry_t *tqe)
(u32)tcp_hdr_ptr[11];
for (i = 0; i < tcp_session; i++) {
+ u32 j = ack_session_info[i].seq_num;
+
if (i < 2 * MAX_TCP_SESSION &&
- ack_session_info[i].seq_num == seq_no) {
+ j == seq_no) {
update_tcp_session(i, ack_no);
break;
}
--
2.7.4
Fix "line over 80 characters" issue found by checkpatch.pl script by
modifying the comment description.
Signed-off-by: Ajay Singh <[email protected]>
---
drivers/staging/wilc1000/wilc_sdio.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 27ec90e..a088999 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -913,8 +913,11 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val)
return 1;
}
if (g_sdio.irq_gpio) {
- /* see below. has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
- /* Cannot clear multiple interrupts. Must clear each interrupt individually */
+ /* has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
+ /*
+ * Cannot clear multiple interrupts.
+ * Must clear each interrupt individually.
+ */
u32 flags;
flags = val & (BIT(MAX_NUM_INT) - 1);
--
2.7.4