Staging: bcm: Remove assignment from if conditions reported by checkpatch.pl
authorKevin McKinney <klmckinney1@gmail.com>
Tue, 11 Oct 2011 01:01:49 +0000 (21:01 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 Oct 2011 16:18:57 +0000 (10:18 -0600)
This patch removes an assignment from three if
conditions.  In all three cases, the line of code was
attempting to allocate memory, and check
if the memory was allocated in the if statement.
This issue was reported by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/bcm/InterfaceInit.c

index 36991f7cbf3331df97d557bb637f4e69fccc2a21..a09d35108f04b6a3f78c3d22612e303776a467fe 100644 (file)
@@ -280,8 +280,9 @@ static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
        int i = 0;
 
        for (i = 0; i < MAXIMUM_USB_TCB; i++) {
-               if ((psIntfAdapter->asUsbTcb[i].urb =
-                               usb_alloc_urb(0, GFP_KERNEL)) == NULL) {
+               psIntfAdapter->asUsbTcb[i].urb = usb_alloc_urb(0, GFP_KERNEL);
+
+               if (psIntfAdapter->asUsbTcb[i].urb == NULL) {
                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
                                "Can't allocate Tx urb for index %d\n", i);
                        return -ENOMEM;
@@ -289,14 +290,17 @@ static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
        }
 
        for (i = 0; i < MAXIMUM_USB_RCB; i++) {
-               if ((psIntfAdapter->asUsbRcb[i].urb =
-                               usb_alloc_urb(0, GFP_KERNEL)) == NULL) {
+               psIntfAdapter->asUsbRcb[i].urb = usb_alloc_urb(0, GFP_KERNEL);
+
+               if (psIntfAdapter->asUsbRcb[i].urb == NULL) {
                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
                                "Can't allocate Rx urb for index %d\n", i);
                        return -ENOMEM;
                }
-               if ((psIntfAdapter->asUsbRcb[i].urb->transfer_buffer =
-                       kmalloc(MAX_DATA_BUFFER_SIZE, GFP_KERNEL)) == NULL) {
+
+               psIntfAdapter->asUsbRcb[i].urb->transfer_buffer = kmalloc(MAX_DATA_BUFFER_SIZE, GFP_KERNEL);
+
+               if (psIntfAdapter->asUsbRcb[i].urb->transfer_buffer == NULL) {
                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
                                "Can't allocate Rx buffer for index %d\n", i);
                        return -ENOMEM;