Patch for wlan-ng/hfa384x_usb.c
Quoted 1 line
From
42dac4d32d75f5aa03f44c06e88795c829df5734Mon Sep 17 00:00:00 2001
From: Adam <[email protected]>
Date: Mon, 3 May 2010 08:31:06 +0100
Subject: [PATCH] Staging: wlan-ng: fix various whitespace and 80 char issues in hfa384x_usb.c
This is a patch to fix various whitespace and 80 character style issues found by checkpatch.pl tool
--- drivers/staging/wlan-ng/hfa384x_usb.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
drivers/staging/wlan-ng/hfa384x_usb.c +11 -9
@@ -62,7 +62,7 @@* * hfa384x_drvr_xxxconfig An example of the drvr level abstraction. These * functions are wrappers for the RID get/set -* sequence. They call copy_[to|from]_bap() and +* sequence. They call copy_[to|from]_bap() and * cmd_access(). These functions operate on the * RIDs and buffers without validation. The caller * is responsible for that.
@@ -451,7 +451,7 @@ static void hfa384x_usb_defer(struct work_struct *data)if (test_bit (WORK_RX_HALT , &hw->usb_flags)) {int ret; -usb_kill_urb (&hw->rx_urb);/* Cannot be holding spinlock! */ +usb_kill_urb (&hw->rx_urb);/* Cannot be holding spinlock!*/ ret =usb_clear_halt (hw->usb, hw->endp_in);if (ret !=0 ) {
@@ -1226,7 +1226,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)* * Arguments: * hw device structure -* ctlx CTLX ptr +* ctlx CTLX ptr * completor functor object to decide what to * do with the CTLX's result. *
@@ -2133,7 +2133,7 @@ exit_proc:* 0 success * >0 f/w reported error - f/w status code * <0 driver reported error -* -ENODATA length mismatch between argument and retrieved +* -ENODATA length mismatch between argument and retrieved * record. * * Side effects:
@@ -2619,7 +2619,7 @@ int hfa384x_drvr_start(hfa384x_t *hw)pr_debug ("First cmd_initialize() failed (result %d),\n" , result1);pr_debug - ("but second attempt succeeded. All should be ok\n" ); + ("but second attempt succeeded.All should be ok\n" ); } }else if (result2 !=0 ) { printk(KERN_WARNING
@@ -3442,7 +3442,7 @@ static void hfa384x_usbin_txcompl(wlandevice_t *wlandev, {u16 status; - status =le16_to_cpu (usbin->type);/* yeah I know it says type... */ + status =le16_to_cpu (usbin->type);/* yeah I know it says type...*/ /* Was there an error? */ if (HFA384x_TXSTATUS_ISERROR (status))
@@ -3583,7 +3583,7 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,struct sk_buff *skb;hfa384x_t *hw = wlandev->priv; -/* Don't forget the status, time, and data_len fields are in host order */ +/* Don't forget: status, time, and data_len fields are in host order */ /* Figure out how big the frame is */ fc =le16_to_cpu (rxdesc->frame_control); hdrlen =p80211_headerlen (fc);
@@ -3632,7 +3632,8 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev, caphdr->encoding =htonl (1 );/* cck */ } -/* Copy the 802.11 header to the skb (ctl frames may be less than a full header) */ +/* Copy the 802.11 header to the skb */ +/* (ctl frames may be less than a full header) */ datap =skb_put (skb, hdrlen);memcpy (datap, &(rxdesc->frame_control), hdrlen);
@@ -3644,7 +3645,8 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,/* check for unencrypted stuff if WEP bit set. */ if (*(datap - hdrlen +1 ) &0x40 )/* wep set */ if ((*(datap) ==0xaa ) && (*(datap +1 ) ==0xaa )) - *(datap - hdrlen +1 ) &=0xbf ;/* clear wep; it's the 802.2 header! */ + *(datap - hdrlen +1 ) &=0xbf ;/* clear wep; */ +/* it's the 802.2 header! */ }if (hw->sniff_fcs) {
Signature · 1 line
1.7.0.4
Quoted 3 lines · Adam Latham
Subject: [PATCH] Staging: wlan-ng: fix various whitespace and 80 char issues in
hfa384x_usb.cThis is a patch to fix various whitespace and 80 character style issues found by checkpatch.pl toolSigned-off-by Adam Latham <[email protected]>
Hi Adam.
drivers/staging/wlan-ng/hfa384x_usb.c
Quoted 4 lines
drivers/staging/wlan-ng/hfa384x_usb.c +0
-0
[]
drivers/staging/wlan-ng/hfa384x_usb.c static void hfa384x_usb_defer(struct work_struct *data) · line 454
Quoted 6 lines
drivers/staging/wlan-ng/hfa384x_usb.c +1
-1@@ -451,7 +451,7 @@ static void hfa384x_usb_defer(struct work_struct *data)if (test_bit (WORK_RX_HALT , &hw->usb_flags)) {int ret; -usb_kill_urb (&hw->rx_urb);/* Cannot be holding spinlock! */ +usb_kill_urb (&hw->rx_urb);/* Cannot be holding spinlock!*/
It's most common to use a space before the trailing */
drivers/staging/wlan-ng/hfa384x_usb.c int hfa384x_drvr_start(hfa384x_t *hw) · line 2622
Quoted 6 lines
drivers/staging/wlan-ng/hfa384x_usb.c +1
-1@@ -2619,7 +2619,7 @@ int hfa384x_drvr_start(hfa384x_t *hw)pr_debug ("First cmd_initialize() failed (result %d),\n" , result1);pr_debug - ("but second attempt succeeded. All should be ok\n" ); + ("but second attempt succeeded.All should be ok\n" );
Removing the space after a period here is not an improvement.
Quoted 12 lines · Joe Perches
Quoted 3 lines · Adam Latham
Subject: [PATCH] Staging: wlan-ng: fix various whitespace and 80 char issues in
hfa384x_usb.cThis is a patch to fix various whitespace and 80 character style issues found by checkpatch.pl toolSigned-off-by Adam Latham <[email protected]>Hi Adam.
drivers/staging/wlan-ng/hfa384x_usb.c
Quoted 4 lines
drivers/staging/wlan-ng/hfa384x_usb.c +0
-0[]
Quoted 8 lines
drivers/staging/wlan-ng/hfa384x_usb.c static void hfa384x_usb_defer(struct work_struct *data) · line 454
Quoted 6 lines
drivers/staging/wlan-ng/hfa384x_usb.c +1
-1@@ -451,7 +451,7 @@ static void hfa384x_usb_defer(struct work_struct *data)if (test_bit (WORK_RX_HALT , &hw->usb_flags)) {int ret; -usb_kill_urb (&hw->rx_urb);/* Cannot be holding spinlock! */ +usb_kill_urb (&hw->rx_urb);/* Cannot be holding spinlock!*/ It's most common to use a space before the trailing */
Yes, move the comment up a line to fix the "line too long" issue.
Quoted 8 lines
drivers/staging/wlan-ng/hfa384x_usb.c int hfa384x_drvr_start(hfa384x_t *hw) · line 2622
Quoted 6 lines
drivers/staging/wlan-ng/hfa384x_usb.c +1
-1@@ -2619,7 +2619,7 @@ int hfa384x_drvr_start(hfa384x_t *hw)pr_debug ("First cmd_initialize() failed (result %d),\n" , result1);pr_debug - ("but second attempt succeeded. All should be ok\n" ); + ("but second attempt succeeded.All should be ok\n" );Removing the space after a period here is not an improvement.
Agreed, don't worry about too-long lines in print statements.
thanks,
greg k-h