]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Staging: wlan-ng: rework code style after feedback
authorEdgardo Hames <ehames@gmail.com>
Tue, 16 Mar 2010 02:00:40 +0000 (23:00 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 18:35:50 +0000 (11:35 -0700)
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>
drivers/staging/wlan-ng/hfa384x_usb.c

index 2400242e2d876d32d881d4431acc5e7d524ff3e5..a41db5dc8c7c592a0f8c670495682ecb97def021 100644 (file)
@@ -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;