staging: ft1000: Fix coding style in ft1000_submit_rx_urb function.
authorMarek Belisko <marek.belisko@open-nandra.com>
Thu, 10 Mar 2011 10:51:28 +0000 (11:51 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Mar 2011 18:51:19 +0000 (11:51 -0700)
Fix coding style and also replace printk with proper pr_err
function.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c

index 63ee38c..f07b3ed 100644 (file)
@@ -1203,38 +1203,36 @@ static int ft1000_copy_up_pkt (struct urb *urb)
 //---------------------------------------------------------------------------
 static int ft1000_submit_rx_urb(struct ft1000_info *info)
 {
-    int result;
-    struct ft1000_device *pFt1000Dev = info->pFt1000Dev;
+       int result;
+       struct ft1000_device *pFt1000Dev = info->pFt1000Dev;
 
+       //DEBUG ("ft1000_submit_rx_urb entered: sizeof rx_urb is %d\n", sizeof(*pFt1000Dev->rx_urb));
+       if (pFt1000Dev->status & FT1000_STATUS_CLOSING) {
+               DEBUG("network driver is closed, return\n");
+               //usb_kill_urb(pFt1000Dev->rx_urb); //mbelian
+               return -ENODEV;
+       }
 
-    //DEBUG ("ft1000_submit_rx_urb entered: sizeof rx_urb is %d\n", sizeof(*pFt1000Dev->rx_urb));
-    if ( pFt1000Dev->status & FT1000_STATUS_CLOSING)
-    {
-        DEBUG("network driver is closed, return\n");
-        //usb_kill_urb(pFt1000Dev->rx_urb); //mbelian
-       return -ENODEV;
-    }
-
-    usb_fill_bulk_urb(pFt1000Dev->rx_urb,
-            pFt1000Dev->dev,
-            usb_rcvbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_in_endpointAddr),
-            pFt1000Dev->rx_buf,
-            MAX_BUF_SIZE,
-            (usb_complete_t)ft1000_copy_up_pkt,
-            info);
-
+       usb_fill_bulk_urb(pFt1000Dev->rx_urb,
+                         pFt1000Dev->dev,
+                         usb_rcvbulkpipe(pFt1000Dev->dev,
+                                         pFt1000Dev->bulk_in_endpointAddr),
+                         pFt1000Dev->rx_buf, MAX_BUF_SIZE,
+                         (usb_complete_t) ft1000_copy_up_pkt, info);
 
-    if((result = usb_submit_urb(pFt1000Dev->rx_urb, GFP_ATOMIC)))
-    {
-        printk("ft1000_submit_rx_urb: submitting rx_urb %d failed\n", result);
-       return result;
-    }
+       result = usb_submit_urb(pFt1000Dev->rx_urb, GFP_ATOMIC);
 
-    //DEBUG("ft1000_submit_rx_urb exit: result=%d\n", result);
+       if (result) {
+               pr_err("ft1000_submit_rx_urb: submitting rx_urb %d failed\n",
+                      result);
+               return result;
+       }
+       //DEBUG("ft1000_submit_rx_urb exit: result=%d\n", result);
 
        return 0;
 }
 
+
 //---------------------------------------------------------------------------
 // Function:    ft1000_open
 //