* [PATCH] staging: wilc1000: remove new line around else and braces
@ 2015-11-08 19:18 Panayiotis Tembriotis
2015-12-18 22:47 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Panayiotis Tembriotis @ 2015-11-08 19:18 UTC (permalink / raw)
To: gregkh
Cc: Panayiotis Tembriotis, johnny.kim, austin.shin, chris.park,
tony.cho, glen.lee, leo.kim, linux-wireless
Remove excess new line characters as suggested by checkpatch.pl:
ERROR: else should follow close brace '}'
ERROR: that open brace { should be on the previous line
Signed-off-by: Panayiotis Tembriotis <panayiotis.tembriotis@gmail.com>
---
drivers/staging/wilc1000/wilc_wlan.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index c02665747705..9966ac8d7ceb 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1056,15 +1056,13 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount)
memcpy(&txb[offset], &header, 4);
if (tqe->type == WILC_CFG_PKT) {
buffer_offset = ETH_CONFIG_PKT_HDR_OFFSET;
- }
- else if (tqe->type == WILC_NET_PKT) {
+ } else if (tqe->type == WILC_NET_PKT) {
char *pBSSID = ((struct tx_complete_data *)(tqe->priv))->pBssid;
buffer_offset = ETH_ETHERNET_HDR_OFFSET;
/* copy the bssid at the sart of the buffer */
memcpy(&txb[offset + 4], pBSSID, 6);
- }
- else {
+ } else {
buffer_offset = HOST_HDR_OFFSET;
}
@@ -1183,9 +1181,7 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
pkt_offset &= ~(IS_MANAGMEMENT | IS_MANAGMEMENT_CALLBACK | IS_MGMT_STATUS_SUCCES);
WILC_WFI_mgmt_rx(wilc, &buffer[offset + HOST_HDR_OFFSET], pkt_len);
- }
- else
- {
+ } else {
if (!is_cfg_packet) {
if (pkt_len > 0) {
--
2.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] staging: wilc1000: remove new line around else and braces
@ 2015-11-13 21:59 Panayiotis Tembriotis
2015-11-14 6:52 ` Sudip Mukherjee
0 siblings, 1 reply; 5+ messages in thread
From: Panayiotis Tembriotis @ 2015-11-13 21:59 UTC (permalink / raw)
To: gregkh
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
devel, linux-wireless, Panayiotis Tembriotis
Remove excess new line characters as suggested by checkpatch.pl:
ERROR: else should follow close brace '}'
ERROR: that open brace { should be on the previous line
Signed-off-by: Panayiotis Tembriotis <panayiotis.tembriotis@gmail.com>
---
drivers/staging/wilc1000/wilc_wlan.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index c02665747705..9966ac8d7ceb 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1056,15 +1056,13 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount)
memcpy(&txb[offset], &header, 4);
if (tqe->type == WILC_CFG_PKT) {
buffer_offset = ETH_CONFIG_PKT_HDR_OFFSET;
- }
- else if (tqe->type == WILC_NET_PKT) {
+ } else if (tqe->type == WILC_NET_PKT) {
char *pBSSID = ((struct tx_complete_data *)(tqe->priv))->pBssid;
buffer_offset = ETH_ETHERNET_HDR_OFFSET;
/* copy the bssid at the sart of the buffer */
memcpy(&txb[offset + 4], pBSSID, 6);
- }
- else {
+ } else {
buffer_offset = HOST_HDR_OFFSET;
}
@@ -1183,9 +1181,7 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
pkt_offset &= ~(IS_MANAGMEMENT | IS_MANAGMEMENT_CALLBACK | IS_MGMT_STATUS_SUCCES);
WILC_WFI_mgmt_rx(wilc, &buffer[offset + HOST_HDR_OFFSET], pkt_len);
- }
- else
- {
+ } else {
if (!is_cfg_packet) {
if (pkt_len > 0) {
--
2.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: wilc1000: remove new line around else and braces
2015-11-13 21:59 [PATCH] staging: wilc1000: remove new line around else and braces Panayiotis Tembriotis
@ 2015-11-14 6:52 ` Sudip Mukherjee
2015-11-14 7:50 ` Panayiotis Tembriotis
0 siblings, 1 reply; 5+ messages in thread
From: Sudip Mukherjee @ 2015-11-14 6:52 UTC (permalink / raw)
To: Panayiotis Tembriotis
Cc: gregkh, devel, chris.park, austin.shin, linux-wireless,
johnny.kim, tony.cho, leo.kim
On Fri, Nov 13, 2015 at 11:59:47PM +0200, Panayiotis Tembriotis wrote:
> Remove excess new line characters as suggested by checkpatch.pl:
> ERROR: else should follow close brace '}'
> ERROR: that open brace { should be on the previous line
>
> Signed-off-by: Panayiotis Tembriotis <panayiotis.tembriotis@gmail.com>
> ---
This has already been done. please use staging-testing tree.
regards
sudip
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: wilc1000: remove new line around else and braces
2015-11-14 6:52 ` Sudip Mukherjee
@ 2015-11-14 7:50 ` Panayiotis Tembriotis
0 siblings, 0 replies; 5+ messages in thread
From: Panayiotis Tembriotis @ 2015-11-14 7:50 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: gregkh, devel, chris.park, austin.shin, linux-wireless,
johnny.kim, tony.cho, leo.kim
On Sat, Nov 14, 2015 at 12:22:29PM +0530, Sudip Mukherjee wrote:
> On Fri, Nov 13, 2015 at 11:59:47PM +0200, Panayiotis Tembriotis wrote:
> > Remove excess new line characters as suggested by checkpatch.pl:
> > ERROR: else should follow close brace '}'
> > ERROR: that open brace { should be on the previous line
> >
> > Signed-off-by: Panayiotis Tembriotis <panayiotis.tembriotis@gmail.com>
> > ---
>
> This has already been done. please use staging-testing tree.
Sorry for spamming and thanks for letting me know.
Regards,
Panayiotis
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: wilc1000: remove new line around else and braces
2015-11-08 19:18 Panayiotis Tembriotis
@ 2015-12-18 22:47 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2015-12-18 22:47 UTC (permalink / raw)
To: Panayiotis Tembriotis
Cc: johnny.kim, austin.shin, chris.park, tony.cho, glen.lee, leo.kim,
linux-wireless
On Sun, Nov 08, 2015 at 09:18:48PM +0200, Panayiotis Tembriotis wrote:
> Remove excess new line characters as suggested by checkpatch.pl:
> ERROR: else should follow close brace '}'
> ERROR: that open brace { should be on the previous line
>
> Signed-off-by: Panayiotis Tembriotis <panayiotis.tembriotis@gmail.com>
> ---
> drivers/staging/wilc1000/wilc_wlan.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
Does not apply against my latest tree :(
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-12-19 0:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-13 21:59 [PATCH] staging: wilc1000: remove new line around else and braces Panayiotis Tembriotis
2015-11-14 6:52 ` Sudip Mukherjee
2015-11-14 7:50 ` Panayiotis Tembriotis
-- strict thread matches above, loose matches on Subject: below --
2015-11-08 19:18 Panayiotis Tembriotis
2015-12-18 22:47 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).