Commit 6a259d9b authored Mar 17, 2014 by Jade Bilkey Committed by Greg Kroah-Hartman Mar 18, 2014

staging: bcm: Cleanup CreateInterruptUrb() and StartInterruptUrb()



Fixes checkpatch.pl warnings and errors:

ERROR: that open brace { should be on the previous line
+	if (!psIntfAdapter->psInterruptUrb)
+	{

WARNING: line over 80 characters
+		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb");

ERROR: space required after that ',' (ctx:VxV)
+		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb");
 		                                        ^

ERROR: space required after that ',' (ctx:VxV)
+		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb");
 		                                                                                ^

WARNING: line over 80 characters
+								psIntfAdapter->ulInterruptData;

WARNING: line over 80 characters
+							sizeof(psIntfAdapter->ulInterruptData);

WARNING: line over 80 characters
+						psIntfAdapter->sIntrIn.int_in_endpointAddr);

WARNING: line over 80 characters
+					psIntfAdapter->psInterruptUrb->transfer_buffer,

WARNING: line over 80 characters
+					psIntfAdapter->psInterruptUrb->transfer_buffer_length,

WARNING: line over 80 characters
+	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n",

ERROR: space required after that ',' (ctx:VxV)
+	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n",
 	                                        ^

ERROR: space required after that ',' (ctx:VxV)
+	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n",
 	                                                                                ^

ERROR: that open brace { should be on the previous line
+	if( false == psIntfAdapter->psAdapter->device_removed &&
+		false == psIntfAdapter->psAdapter->bEndPointHalted &&
+		false == psIntfAdapter->bSuspended &&
+		false == psIntfAdapter->bPreparingForBusSuspend &&
+		false == psIntfAdapter->psAdapter->StopAllXaction)
+	{

ERROR: space prohibited after that open parenthesis '('
+	if( false == psIntfAdapter->psAdapter->device_removed &&

ERROR: space required before the open parenthesis '('
+	if( false == psIntfAdapter->psAdapter->device_removed &&

WARNING: line over 80 characters
+		status = usb_submit_urb(psIntfAdapter->psInterruptUrb, GFP_ATOMIC);

ERROR: that open brace { should be on the previous line
+		if (status)
+		{

WARNING: line over 80 characters
+			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status);

ERROR: space required after that ',' (ctx:VxV)
+			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status);
 			                                        ^

ERROR: space required after that ',' (ctx:VxV)
+			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status);
 			                                                                                ^

ERROR: that open brace { should be on the previous line
+			if(status == -EPIPE)
+			{

ERROR: space required before the open parenthesis '('
+			if(status == -EPIPE)

WARNING: line over 80 characters
+				psIntfAdapter->psAdapter->bEndPointHalted = TRUE ;

WARNING: space prohibited before semicolon
+				psIntfAdapter->psAdapter->bEndPointHalted = TRUE ;

WARNING: line over 80 characters
+				wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue);

Signed-off-by: Jade Bilkey <herself@thefumon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 94e74333

drivers/staging/bcm/InterfaceIsr.c

+30 −27

Original line number	Diff line number	Diff line
		@@ -136,9 +136,10 @@ static void read_int_callback(struct urb urb/, struct pt_regs regs/)
		int CreateInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
		{
		psIntfAdapter->psInterruptUrb = usb_alloc_urb(0, GFP_KERNEL);
		if (!psIntfAdapter->psInterruptUrb)
		{
		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb");
		if (!psIntfAdapter->psInterruptUrb) {
		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS,
		INTF_INIT, DBG_LVL_ALL,
		"Cannot allocate interrupt urb");
		return -ENOMEM;
		}
		psIntfAdapter->psInterruptUrb->transfer_buffer =
		@@ -156,7 +157,8 @@ int CreateInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
		read_int_callback, psIntfAdapter,
		psIntfAdapter->sIntrIn.int_in_interval);

		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n",
		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, INTF_INIT,
		DBG_LVL_ALL, "Interrupt Interval: %d\n",
		psIntfAdapter->sIntrIn.int_in_interval);
		return 0;
		}
		@@ -170,15 +172,16 @@ INT StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
		false == psIntfAdapter->psAdapter->bEndPointHalted &&
		false == psIntfAdapter->bSuspended &&
		false == psIntfAdapter->bPreparingForBusSuspend &&
		false == psIntfAdapter->psAdapter->StopAllXaction)
		{
		status = usb_submit_urb(psIntfAdapter->psInterruptUrb, GFP_ATOMIC);
		if (status)
		{
		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status);
		if(status == -EPIPE)
		{
		psIntfAdapter->psAdapter->bEndPointHalted = TRUE ;
		false == psIntfAdapter->psAdapter->StopAllXaction) {
		status =
		usb_submit_urb(psIntfAdapter->psInterruptUrb, GFP_ATOMIC);
		if (status) {
		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,
		DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,
		"Cannot send inturb %d\n", status);
		if (status == -EPIPE) {
		psIntfAdapter->psAdapter->bEndPointHalted =
		TRUE;
		wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue);
		}
		}