* [PATCH] staging: wilc1000: Fix line over 80 charcters long
@ 2016-02-15 12:11 Anchal Jain
2016-02-16 2:21 ` [Outreachy kernel] " Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Anchal Jain @ 2016-02-15 12:11 UTC (permalink / raw)
To: outreachy-kernel
This is a patch that fixes line over 80 characters coding style
warning detected by checkpatch.pl.
Signed-off-by: Anchal Jain <anchalj109@gmail.com>
---
drivers/staging/wilc1000/wilc_wlan.c | 69 ++++++++++++++++++++++++------------
1 file changed, 47 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 98b21d4..45f70ab 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -200,7 +200,8 @@ static inline int add_tcp_pending_ack(u32 ack, u32 session_index,
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;
+ pending_acks_info[pending_base +
+ pending_acks].session_index = session_index;
txqe->tcp_pending_ack_idx = pending_base + pending_acks;
pending_acks++;
}
@@ -256,7 +257,8 @@ static inline int tcp_process(struct net_device *dev, struct txq_entry_t *tqe)
for (i = 0; i < tcp_session; i++) {
if (i < 2 * MAX_TCP_SESSION &&
- ack_session_info[i].seq_num == seq_no) {
+ ack_session_info[i].seq_num ==
+ seq_no) {
update_tcp_session(i, ack_no);
break;
}
@@ -292,7 +294,9 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev)
if (i >= MAX_PENDING_ACKS ||
pending_acks_info[i].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) {
+ if (pending_acks_info[i].ack_num <
+ ack_session_info[pending_acks_info
+ [i].session_index].bigger_ack_num) {
struct txq_entry_t *tqe;
tqe = pending_acks_info[i].txqe;
@@ -513,7 +517,8 @@ void chip_wakeup(struct wilc *wilc)
if ((wilc_get_chipid(wilc, true) == 0))
wilc_debug(N_ERR, "Couldn't read chip id. Wake up failed\n");
- } while ((wilc_get_chipid(wilc, true) == 0) && ((++trials % 3) == 0));
+ } while ((wilc_get_chipid(wilc, true) == 0) &&
+ ((++trials % 3) == 0));
} while (wilc_get_chipid(wilc, true) == 0);
} else if ((wilc->io_type & 0x1) == HIF_SDIO) {
@@ -526,7 +531,8 @@ 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) &&
+ (((++trials) % 3) == 0)) {
usleep_range(2 * 1000, 2 * 1000);
wilc->hif_func->hif_read_reg(wilc, 0xf1,
@@ -672,7 +678,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 = wilc->hif_func->hif_write_reg(
+ wilc, WILC_HOST_TX_CTRL, 0);
break;
}
}
@@ -683,7 +690,9 @@ 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 = wilc->hif_func->hif_block_tx(
+ wilc, WILC_VMM_TBL_RX_SHADOW_BASE,
+ (u8 *)vmm_table, ((i + 1) * 4));
if (!ret)
break;
@@ -694,7 +703,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
break;
do {
- ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_VMM_CTL, ®);
+ ret = wilc->hif_func->hif_read_reg(
+ wilc, WILC_HOST_VMM_CTL, ®);
if (!ret)
break;
if ((reg >> 2) & 0x1) {
@@ -705,7 +715,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
}
} while (--timeout);
if (timeout <= 0) {
- ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_VMM_CTL, 0x0);
+ ret = wilc->hif_func->hif_write_reg(
+ wilc, WILC_HOST_VMM_CTL, 0x0);
break;
}
@@ -713,11 +724,13 @@ 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 = wilc->hif_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 = wilc->hif_func->hif_write_reg(
+ wilc, WILC_HOST_TX_CTRL, reg);
if (!ret)
break;
break;
@@ -757,9 +770,12 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
header = cpu_to_le32(header);
memcpy(&txb[offset], &header, 4);
if (tqe->type == WILC_CFG_PKT) {
- buffer_offset = ETH_CONFIG_PKT_HDR_OFFSET;
+ buffer_offset =
+ ETH_CONFIG_PKT_HDR_OFFSET;
} else if (tqe->type == WILC_NET_PKT) {
- char *bssid = ((struct tx_complete_data *)(tqe->priv))->bssid;
+ char *bssid =
+ ((struct tx_complete_data *)
+ (tqe->priv))->bssid;
buffer_offset = ETH_ETHERNET_HDR_OFFSET;
memcpy(&txb[offset + 4], bssid, 6);
@@ -777,7 +793,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
tqe->status);
if (tqe->tcp_pending_ack_idx != NOT_TCP_ACK &&
tqe->tcp_pending_ack_idx < MAX_PENDING_ACKS)
- pending_acks_info[tqe->tcp_pending_ack_idx].txqe = NULL;
+ pending_acks_info[tqe->
+ tcp_pending_ack_idx].txqe = NULL;
kfree(tqe);
} else {
break;
@@ -853,7 +870,8 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
IS_MANAGMEMENT_CALLBACK |
IS_MGMT_STATUS_SUCCES);
- WILC_WFI_mgmt_rx(wilc, &buffer[offset + HOST_HDR_OFFSET], pkt_len);
+ WILC_WFI_mgmt_rx(wilc, &buffer[offset +
+ HOST_HDR_OFFSET], pkt_len);
} else {
if (!is_cfg_packet) {
if (pkt_len > 0) {
@@ -865,15 +883,22 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
} else {
struct wilc_cfg_rsp rsp;
- wilc_wlan_cfg_indicate_rx(wilc, &buffer[pkt_offset + offset], pkt_len, &rsp);
+ wilc_wlan_cfg_indicate_rx(wilc, &buffer
+ [pkt_offset + offset],
+ pkt_len, &rsp);
if (rsp.type == WILC_CFG_RSP) {
- if (wilc->cfg_seq_no == rsp.seq_no)
+ if (wilc->cfg_seq_no ==
+ rsp.seq_no)
up(&wilc->cfg_event);
- } else if (rsp.type == WILC_CFG_RSP_STATUS) {
- wilc_mac_indicate(wilc, WILC_MAC_INDICATE_STATUS);
-
- } else if (rsp.type == WILC_CFG_RSP_SCAN) {
- wilc_mac_indicate(wilc, WILC_MAC_INDICATE_SCAN);
+ } else if (rsp.type ==
+ WILC_CFG_RSP_STATUS) {
+ wilc_mac_indicate(wilc,
+ WILC_MAC_INDICATE_STATUS);
+
+ } else if (rsp.type ==
+ WILC_CFG_RSP_SCAN) {
+ wilc_mac_indicate(
+ wilc, WILC_MAC_INDICATE_SCAN);
}
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Outreachy kernel] [PATCH] staging: wilc1000: Fix line over 80 charcters long
2016-02-15 12:11 [PATCH] staging: wilc1000: Fix line over 80 charcters long Anchal Jain
@ 2016-02-16 2:21 ` Greg KH
2016-02-16 2:23 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2016-02-16 2:21 UTC (permalink / raw)
To: Anchal Jain; +Cc: outreachy-kernel
On Mon, Feb 15, 2016 at 05:41:02PM +0530, Anchal Jain wrote:
> This is a patch that fixes line over 80 characters coding style
> warning detected by checkpatch.pl.
>
> Signed-off-by: Anchal Jain <anchalj109@gmail.com>
> ---
> drivers/staging/wilc1000/wilc_wlan.c | 69 ++++++++++++++++++++++++------------
> 1 file changed, 47 insertions(+), 22 deletions(-)
You sent 5 patches, but I have no idea what order to apply them in :(
Please resend them as a patch series, properly numbered, so I have a
chance as to know how to merge them to my tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: wilc1000: Fix line over 80 charcters long
2016-02-16 2:21 ` [Outreachy kernel] " Greg KH
@ 2016-02-16 2:23 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2016-02-16 2:23 UTC (permalink / raw)
To: Anchal Jain; +Cc: outreachy-kernel
On Mon, Feb 15, 2016 at 06:21:30PM -0800, Greg KH wrote:
> On Mon, Feb 15, 2016 at 05:41:02PM +0530, Anchal Jain wrote:
> > This is a patch that fixes line over 80 characters coding style
> > warning detected by checkpatch.pl.
> >
> > Signed-off-by: Anchal Jain <anchalj109@gmail.com>
> > ---
> > drivers/staging/wilc1000/wilc_wlan.c | 69 ++++++++++++++++++++++++------------
> > 1 file changed, 47 insertions(+), 22 deletions(-)
>
> You sent 5 patches, but I have no idea what order to apply them in :(
Make that 6, that last one didn't apply :(
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-16 2:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-15 12:11 [PATCH] staging: wilc1000: Fix line over 80 charcters long Anchal Jain
2016-02-16 2:21 ` [Outreachy kernel] " Greg KH
2016-02-16 2:23 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.