Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ffab688 authored by Edgardo Hames's avatar Edgardo Hames Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: rework code style after feedback 



This patch includes the feedback received from Richard Kennedy.

Signed-off-by: default avatarEdgardo Hames <ehames@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5813b624

drivers/staging/wlan-ng/hfa384x_usb.c

+8 −11
Original line number Diff line number Diff line
@@ -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 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin, 
			 * 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 @@ static void hfa384x_ctlxout_callback(struct urb *urb) 


		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;