lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: wlan-ng: rework code style after feedback

Browse Source 
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>
This commit is contained in:
Edgardo Hames
2010-03-15 23:00:40 -03:00
committed by Greg Kroah-Hartman
parent 5813b6243c
commit 4ffab68882
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/wlan-ng/hfa384x_usb.c
View File

@@ -2612,19 +2612,18 @@ int hfa384x_drvr_start(hfa384x_t *hw)
if (result1 != 0) { if (result1 != 0) {
if (result2 != 0) { if (result2 != 0) {
printk(KERN_ERR printk(KERN_ERR
"cmd_initialize() failed on two attempts," "cmd_initialize() failed on two attempts, results %d and %d\n",
" results %d and %d\n", result1, result2); result1, result2);
usb_kill_urb(&hw->rx_urb); usb_kill_urb(&hw->rx_urb);
goto done; goto done;
} else { } else {
pr_debug("First cmd_initialize() failed (result %d),\n", pr_debug("First cmd_initialize() failed (result %d),\n",
result1); result1);
pr_debug("but second attempt succeeded." pr_debug("but second attempt succeeded. All should be ok\n");
" All should be ok\n");
} }
} else if (result2 != 0) { } else if (result2 != 0) {
printk(KERN_WARNING "First cmd_initialize() succeeded," printk(KERN_WARNING "First cmd_initialize() succeeded, but second attempt failed (result=%d)\n",
" but second attempt failed (result=%d)\n", result2); result2);
printk(KERN_WARNING printk(KERN_WARNING
"Most likely the card will be functional\n"); "Most likely the card will be functional\n");
goto done; goto done;
@@ -3382,9 +3381,7 @@ retry:
* our request has been acknowledged. Odd, * our request has been acknowledged. Odd,
* but our OUT URB is still alive... * but our OUT URB is still alive...
*/ */
pr_debug("Causality violation: " pr_debug("Causality violation: please reboot Universe\n");
"please reboot Universe, or email "
"linux-wlan-devel@lists.linux-wlan.com\n");
ctlx->state = CTLX_RESP_COMPLETE; ctlx->state = CTLX_RESP_COMPLETE;
break; break;
@@ -3848,8 +3845,8 @@ retry:
default: default:
/* This is NOT a valid CTLX "success" state! */ /* This is NOT a valid CTLX "success" state! */
printk(KERN_ERR "Illegal CTLX[%d]" printk(KERN_ERR
" success state(%s, %d) in OUT URB\n", "Illegal CTLX[%d] success state(%s, %d) in OUT URB\n",
le16_to_cpu(ctlx->outbuf.type), le16_to_cpu(ctlx->outbuf.type),
ctlxstr(ctlx->state), urb->status); ctlxstr(ctlx->state), urb->status);
break; break;