summaryrefslogtreecommitdiff
path: root/drivers/staging/wlan-ng
diff options
context:
space:
mode:
authorEdgardo Hames <ehames@gmail.com>2010-03-15 23:00:40 -0300
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 11:35:50 -0700
commit4ffab688827361bcdaca6ac83bbda195c53bd098 (patch)
tree0970e51c53b00960f195de6c1fcfa2d00a9fc048 /drivers/staging/wlan-ng
parent5813b6243cf02b89c6e6a6a8debc10477e5ce3a8 (diff)
Staging: wlan-ng: rework code style after feedback
This patch includes the feedback received from Richard Kennedy. Signed-off-by: Edgardo Hames <ehames@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng')
-rw-r--r--drivers/staging/wlan-ng/hfa384x_usb.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 2400242e2d87..a41db5dc8c7c 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -2612,19 +2612,18 @@ int hfa384x_drvr_start(hfa384x_t *hw)
if (result1 != 0) {
if (result2 != 0) {
printk(KERN_ERR
- "cmd_initialize() failed on two attempts,"
- " results %d and %d\n", result1, result2);
+ "cmd_initialize() failed on two attempts, results %d and %d\n",
+ result1, result2);
usb_kill_urb(&hw->rx_urb);
goto done;
} else {
pr_debug("First cmd_initialize() failed (result %d),\n",
result1);
- pr_debug("but second attempt succeeded."
- " All should be ok\n");
+ pr_debug("but second attempt succeeded. All should be ok\n");
}
} else if (result2 != 0) {
- printk(KERN_WARNING "First cmd_initialize() succeeded,"
- " but second attempt failed (result=%d)\n", result2);
+ printk(KERN_WARNING "First cmd_initialize() succeeded, but second attempt failed (result=%d)\n",
+ result2);
printk(KERN_WARNING
"Most likely the card will be functional\n");
goto done;
@@ -3382,9 +3381,7 @@ retry:
* our request has been acknowledged. Odd,
* but our OUT URB is still alive...
*/
- pr_debug("Causality violation: "
- "please reboot Universe, or email "
- "linux-wlan-devel@lists.linux-wlan.com\n");
+ pr_debug("Causality violation: please reboot Universe\n");
ctlx->state = CTLX_RESP_COMPLETE;
break;
@@ -3848,8 +3845,8 @@ retry:
default:
/* This is NOT a valid CTLX "success" state! */
- printk(KERN_ERR "Illegal CTLX[%d]"
- " success state(%s, %d) in OUT URB\n",
+ printk(KERN_ERR
+ "Illegal CTLX[%d] success state(%s, %d) in OUT URB\n",
le16_to_cpu(ctlx->outbuf.type),
ctlxstr(ctlx->state), urb->status);
break;