Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[~shefty/rdma-dev.git] / drivers / staging / bcm / InterfaceInit.c
index e97ad99b1bb48cdde08f11a861f21d0f409b9d6a..d78d5ef1f298c66a3cd4e580ead618389e094709 100644 (file)
@@ -1,54 +1,63 @@
 #include "headers.h"
 
 static struct usb_device_id InterfaceUsbtable[] = {
-    { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3) },
+       { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3) },
        { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3B) },
        { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3L) },
-       { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_226) },
+       { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_SM250) },
+       { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_226) },
        { USB_DEVICE(BCM_USB_VENDOR_ID_FOXCONN, BCM_USB_PRODUCT_ID_1901) },
-    {}
+       { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_TU25) },
+       { }
 };
+MODULE_DEVICE_TABLE(usb, InterfaceUsbtable);
 
-VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int debug = -1;
+module_param(debug, uint, 0600);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
+static const u32 default_msg =
+       NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK
+       | NETIF_MSG_TIMER | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR
+       | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN;
+
+static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER Adapter);
+
+static void InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
-       INT i = 0;
-       // Wake up the wait_queue...
-       if(psIntfAdapter->psAdapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY)
-       {
+       int i = 0;
+
+       /* Wake up the wait_queue... */
+       if (psIntfAdapter->psAdapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
                psIntfAdapter->psAdapter->DriverState = DRIVER_HALT;
                wake_up(&psIntfAdapter->psAdapter->LEDInfo.notify_led_event);
        }
        reset_card_proc(psIntfAdapter->psAdapter);
 
-       //worst case time taken by the RDM/WRM will be 5 sec. will check after every 100 ms
-       //to accertain the device is not being accessed. After this No RDM/WRM should be made.
-       while(psIntfAdapter->psAdapter->DeviceAccess)
-       {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Device is being Accessed \n");
+       /*
+        * worst case time taken by the RDM/WRM will be 5 sec. will check after every 100 ms
+        * to accertain the device is not being accessed. After this No RDM/WRM should be made.
+        */
+       while (psIntfAdapter->psAdapter->DeviceAccess) {
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                       "Device is being accessed.\n");
                msleep(100);
        }
        /* Free interrupt URB */
-       //psIntfAdapter->psAdapter->device_removed = TRUE;
-       if(psIntfAdapter->psInterruptUrb)
-       {
-               usb_free_urb(psIntfAdapter->psInterruptUrb);
-       }
+       /* psIntfAdapter->psAdapter->device_removed = TRUE; */
+       usb_free_urb(psIntfAdapter->psInterruptUrb);
 
        /* Free transmit URBs */
-       for(i = 0; i < MAXIMUM_USB_TCB; i++)
-       {
-               if(psIntfAdapter->asUsbTcb[i].urb  != NULL)
-               {
+       for (i = 0; i < MAXIMUM_USB_TCB; i++) {
+               if (psIntfAdapter->asUsbTcb[i].urb  != NULL) {
                        usb_free_urb(psIntfAdapter->asUsbTcb[i].urb);
                        psIntfAdapter->asUsbTcb[i].urb = NULL;
                }
        }
        /* Free receive URB and buffers */
-       for(i = 0; i < MAXIMUM_USB_RCB; i++)
-       {
-               if (psIntfAdapter->asUsbRcb[i].urb != NULL)
-               {
-                       bcm_kfree(psIntfAdapter->asUsbRcb[i].urb->transfer_buffer);
+       for (i = 0; i < MAXIMUM_USB_RCB; i++) {
+               if (psIntfAdapter->asUsbRcb[i].urb != NULL) {
+                       kfree(psIntfAdapter->asUsbRcb[i].urb->transfer_buffer);
                        usb_free_urb(psIntfAdapter->asUsbRcb[i].urb);
                        psIntfAdapter->asUsbRcb[i].urb = NULL;
                }
@@ -56,151 +65,109 @@ VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
        AdapterFree(psIntfAdapter->psAdapter);
 }
 
-
-
-static int usbbcm_open(struct inode *inode, struct file *file)
-{
-       return 0;
-}
-
-static int usbbcm_release(struct inode *inode, struct file *file)
-{
-       return 0;
-}
-
-static ssize_t usbbcm_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
-{
-       return 0;
-}
-
-static ssize_t usbbcm_write(struct file *file, const char __user *user_buffer, size_t count, loff_t *ppos)
+static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
 {
-       return 0;
-}
+       unsigned long ulReg = 0;
+       int ret;
 
-
-VOID ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
-{
-       ULONG ulReg = 0;
-
-// Program EP2 MAX_PKT_SIZE
+       /* Program EP2 MAX_PKT_SIZE */
        ulReg = ntohl(EP2_MPS_REG);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x128,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x128, 4, TRUE);
        ulReg = ntohl(EP2_MPS);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x12C,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x12C, 4, TRUE);
 
        ulReg = ntohl(EP2_CFG_REG);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x132,4,TRUE);
-       if(((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter))->bHighSpeedDevice == TRUE)
-       {
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x132, 4, TRUE);
+       if (((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter))->bHighSpeedDevice == TRUE) {
                ulReg = ntohl(EP2_CFG_INT);
-               BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x136,4,TRUE);
-       }
-       else
-       {
-// USE BULK EP as TX in FS mode.
+               BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x136, 4, TRUE);
+       } else {
+               /* USE BULK EP as TX in FS mode. */
                ulReg = ntohl(EP2_CFG_BULK);
-               BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x136,4,TRUE);
+               BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x136, 4, TRUE);
        }
 
-
-// Program EP4 MAX_PKT_SIZE.
+       /* Program EP4 MAX_PKT_SIZE. */
        ulReg = ntohl(EP4_MPS_REG);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x13C,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x13C, 4, TRUE);
        ulReg = ntohl(EP4_MPS);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x140,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x140, 4, TRUE);
 
-//     Program TX EP as interrupt (Alternate Setting)
-       if( rdmalt(Adapter,0x0F0110F8, (PUINT)&ulReg,4))
-       {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "reading of Tx EP is failing");
-               return ;
+       /* Program TX EP as interrupt(Alternate Setting) */
+       ret = rdmalt(Adapter, 0x0F0110F8, (u32 *)&ulReg, sizeof(u32));
+       if (ret) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                       "reading of Tx EP failed\n");
+               return;
        }
        ulReg |= 0x6;
 
        ulReg = ntohl(ulReg);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1CC,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1CC, 4, TRUE);
 
        ulReg = ntohl(EP4_CFG_REG);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1C8,4,TRUE);
-// Program ISOCHRONOUS EP size to zero.
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1C8, 4, TRUE);
+       /* Program ISOCHRONOUS EP size to zero. */
        ulReg = ntohl(ISO_MPS_REG);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1D2,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1D2, 4, TRUE);
        ulReg = ntohl(ISO_MPS);
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1D6,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1D6, 4, TRUE);
 
-// Update EEPROM Version.
-// Read 4 bytes from 508 and modify 511 and 510.
-//
-       ReadBeceemEEPROM(Adapter,0x1FC,(PUINT)&ulReg);
+       /*
+        * Update EEPROM Version.
+        * Read 4 bytes from 508 and modify 511 and 510.
+        */
+       ReadBeceemEEPROM(Adapter, 0x1FC, (PUINT)&ulReg);
        ulReg &= 0x0101FFFF;
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1FC,4,TRUE);
-//
-//Update length field if required. Also make the string NULL terminated.
-//
-       ReadBeceemEEPROM(Adapter,0xA8,(PUINT)&ulReg);
-       if((ulReg&0x00FF0000)>>16 > 0x30)
-       {
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1FC, 4, TRUE);
+
+       /* Update length field if required. Also make the string NULL terminated. */
+
+       ReadBeceemEEPROM(Adapter, 0xA8, (PUINT)&ulReg);
+       if ((ulReg&0x00FF0000)>>16 > 0x30) {
                ulReg = (ulReg&0xFF00FFFF)|(0x30<<16);
-               BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0xA8,4,TRUE);
+               BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0xA8, 4, TRUE);
        }
-       ReadBeceemEEPROM(Adapter,0x148,(PUINT)&ulReg);
-       if((ulReg&0x00FF0000)>>16 > 0x30)
-       {
+       ReadBeceemEEPROM(Adapter, 0x148, (PUINT)&ulReg);
+       if ((ulReg&0x00FF0000)>>16 > 0x30) {
                ulReg = (ulReg&0xFF00FFFF)|(0x30<<16);
-               BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x148,4,TRUE);
+               BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x148, 4, TRUE);
        }
        ulReg = 0;
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x122,4,TRUE);
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x122, 4, TRUE);
        ulReg = 0;
-       BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1C2,4,TRUE);
-
+       BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1C2, 4, TRUE);
 }
 
-static struct file_operations usbbcm_fops = {
-    .open    =  usbbcm_open,
-    .release =  usbbcm_release,
-    .read    =  usbbcm_read,
-    .write   =  usbbcm_write,
-    .owner   =  THIS_MODULE,
-       .llseek = no_llseek,
-};
-
-static struct usb_class_driver usbbcm_class = {
-    .name =            "usbbcm",
-    .fops =            &usbbcm_fops,
-    .minor_base =   BCM_USB_MINOR_BASE,
-};
-
 static int
 usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
-       int retval =0 ;
-       PMINI_ADAPTER psAdapter = NULL;
-       PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
-       struct usb_device      *udev = NULL;
-
-//     BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Usbbcm probe!!");
-       if((intf == NULL) || (id == NULL))
-       {
-       //      BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "intf or id is NULL");
-               return -EINVAL;
-       }
+       struct usb_device *udev = interface_to_usbdev(intf);
+       int retval;
+       PMINI_ADAPTER psAdapter;
+       PS_INTERFACE_ADAPTER psIntfAdapter;
+       struct net_device *ndev;
 
-       /* Allocate Adapter structure */
-       if((psAdapter = kzalloc(sizeof(MINI_ADAPTER), GFP_KERNEL)) == NULL)
-       {
-               BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0, "Out of memory");
+       /* Reserve one extra queue for the bit-bucket */
+       ndev = alloc_etherdev_mq(sizeof(MINI_ADAPTER), NO_OF_QUEUES+1);
+       if (ndev == NULL) {
+               dev_err(&udev->dev, DRV_NAME ": no memory for device\n");
                return -ENOMEM;
        }
 
-    /* Init default driver debug state */
+       SET_NETDEV_DEV(ndev, &intf->dev);
 
-    psAdapter->stDebugState.debug_level = DBG_LVL_CURR;
+       psAdapter = netdev_priv(ndev);
+       psAdapter->dev = ndev;
+       psAdapter->msg_enable = netif_msg_init(debug, default_msg);
+
+       /* Init default driver debug state */
+
+       psAdapter->stDebugState.debug_level = DBG_LVL_CURR;
        psAdapter->stDebugState.type = DBG_TYPE_INITEXIT;
-       memset (psAdapter->stDebugState.subtype, 0, sizeof (psAdapter->stDebugState.subtype));
 
-    /* Technically, one can start using BCM_DEBUG_PRINT after this point.
+       /*
+        * Technically, one can start using BCM_DEBUG_PRINT after this point.
         * However, realize that by default the Type/Subtype bitmaps are all zero now;
         * so no prints will actually appear until the TestApp turns on debug paths via
         * the ioctl(); so practically speaking, in early init, no logging happens.
@@ -211,160 +178,128 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
         * Further, we turn this OFF once init_module() completes.
         */
 
-    psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0xff;
+       psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0xff;
        BCM_SHOW_DEBUG_BITMAP(psAdapter);
 
        retval = InitAdapter(psAdapter);
-       if(retval)
-       {
-               BCM_DEBUG_PRINT (psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InitAdapter Failed\n");
+       if (retval) {
+               dev_err(&udev->dev, DRV_NAME ": InitAdapter Failed\n");
                AdapterFree(psAdapter);
                return retval;
        }
 
        /* Allocate interface adapter structure */
-       if((psAdapter->pvInterfaceAdapter =
-               kmalloc(sizeof(S_INTERFACE_ADAPTER), GFP_KERNEL)) == NULL)
-       {
-               BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0, "Out of memory");
-               AdapterFree (psAdapter);
+       psIntfAdapter = kzalloc(sizeof(S_INTERFACE_ADAPTER), GFP_KERNEL);
+       if (psIntfAdapter == NULL) {
+               dev_err(&udev->dev, DRV_NAME ": no memory for Interface adapter\n");
+               AdapterFree(psAdapter);
                return -ENOMEM;
        }
-       memset(psAdapter->pvInterfaceAdapter, 0, sizeof(S_INTERFACE_ADAPTER));
 
-       psIntfAdapter = InterfaceAdapterGet(psAdapter);
+       psAdapter->pvInterfaceAdapter = psIntfAdapter;
        psIntfAdapter->psAdapter = psAdapter;
 
        /* Store usb interface in Interface Adapter */
        psIntfAdapter->interface = intf;
        usb_set_intfdata(intf, psIntfAdapter);
 
-       BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%p",psIntfAdapter);
+       BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+               "psIntfAdapter 0x%p\n", psIntfAdapter);
        retval = InterfaceAdapterInit(psIntfAdapter);
-       if(retval)
-       {
+       if (retval) {
                /* If the Firmware/Cfg File is not present
-                * then return success, let the application
-                * download the files.
-                */
-               if(-ENOENT == retval){
-                       BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "File Not Found, Use App to Download\n");
+                * then return success, let the application
+                * download the files.
+                */
+               if (-ENOENT == retval) {
+                       BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                               "File Not Found.  Use app to download.\n");
                        return STATUS_SUCCESS;
                }
-               BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InterfaceAdapterInit Failed \n");
+               BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                       "InterfaceAdapterInit failed.\n");
                usb_set_intfdata(intf, NULL);
-               udev = interface_to_usbdev (intf);
+               udev = interface_to_usbdev(intf);
                usb_put_dev(udev);
-               if(psAdapter->bUsbClassDriverRegistered == TRUE)
-                               usb_deregister_dev (intf, &usbbcm_class);
                InterfaceAdapterFree(psIntfAdapter);
-               return retval ;
+               return retval;
        }
-       if(psAdapter->chip_id > T3)
-       {
-               uint32_t uiNackZeroLengthInt=4;
-               if(wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt)))
-               {
-                       return -EIO;;
-               }
+       if (psAdapter->chip_id > T3) {
+               uint32_t uiNackZeroLengthInt = 4;
+
+               retval = wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt));
+               if (retval)
+                       return retval;
        }
 
-       udev = interface_to_usbdev (intf);
        /* Check whether the USB-Device Supports remote Wake-Up */
-       if(USB_CONFIG_ATT_WAKEUP & udev->actconfig->desc.bmAttributes)
-       {
+       if (USB_CONFIG_ATT_WAKEUP & udev->actconfig->desc.bmAttributes) {
                /* If Suspend then only support dynamic suspend */
-               if(psAdapter->bDoSuspend)
-               {
+               if (psAdapter->bDoSuspend) {
 #ifdef CONFIG_PM
                        pm_runtime_set_autosuspend_delay(&udev->dev, 0);
                        intf->needs_remote_wakeup = 1;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                       udev->autosuspend_disabled = 0;
-#else
                        usb_enable_autosuspend(udev);
-#endif
-                       device_init_wakeup(&intf->dev,1);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
-                       usb_autopm_disable(intf);
-#endif
+                       device_init_wakeup(&intf->dev, 1);
                        INIT_WORK(&psIntfAdapter->usbSuspendWork, putUsbSuspend);
-                       BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Enabling USB Auto-Suspend\n");
+                       BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                               "Enabling USB Auto-Suspend\n");
 #endif
-               }
-               else
-               {
+               } else {
                        intf->needs_remote_wakeup = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                       udev->autosuspend_disabled = 1;
-#else
                        usb_disable_autosuspend(udev);
-#endif
                }
        }
 
-    psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0x0;
-    return retval;
+       psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0x0;
+       return retval;
 }
 
-static void usbbcm_disconnect (struct usb_interface *intf)
+static void usbbcm_disconnect(struct usb_interface *intf)
 {
-       PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
-       PMINI_ADAPTER psAdapter = NULL;
-       struct usb_device       *udev = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-
-       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Usb disconnected");
-       if(intf == NULL)
-       {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "intf pointer is NULL");
-               return;
-       }
-       psIntfAdapter = usb_get_intfdata(intf);
-       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%p",psIntfAdapter);
-       if(psIntfAdapter == NULL)
-       {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InterfaceAdapter pointer is NULL");
+       PS_INTERFACE_ADAPTER psIntfAdapter = usb_get_intfdata(intf);
+       PMINI_ADAPTER psAdapter;
+       struct usb_device  *udev = interface_to_usbdev(intf);
+
+       if (psIntfAdapter == NULL)
                return;
-       }
+
        psAdapter = psIntfAdapter->psAdapter;
-       if(psAdapter->bDoSuspend)
+       netif_device_detach(psAdapter->dev);
+
+       if (psAdapter->bDoSuspend)
                intf->needs_remote_wakeup = 0;
 
        psAdapter->device_removed = TRUE ;
        usb_set_intfdata(intf, NULL);
        InterfaceAdapterFree(psIntfAdapter);
-       udev = interface_to_usbdev (intf);
        usb_put_dev(udev);
-       usb_deregister_dev (intf, &usbbcm_class);
 }
 
-
-static __inline int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
+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)
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cant allocate Tx urb for index %d", i);
+
+       for (i = 0; i < MAXIMUM_USB_TCB; i++) {
+               if ((psIntfAdapter->asUsbTcb[i].urb =
+                               usb_alloc_urb(0, GFP_KERNEL)) == NULL) {
+                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Can't allocate Tx urb for index %d\n", i);
                        return -ENOMEM;
                }
        }
 
-       for(i = 0; i < MAXIMUM_USB_RCB; i++)
-       {
+       for (i = 0; i < MAXIMUM_USB_RCB; i++) {
                if ((psIntfAdapter->asUsbRcb[i].urb =
-                               usb_alloc_urb(0, GFP_KERNEL)) == NULL)
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cant allocate Rx urb for index %d", i);
+                               usb_alloc_urb(0, GFP_KERNEL)) == 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)
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cant allocate Rx buffer for index %d", i);
+               if ((psIntfAdapter->asUsbRcb[i].urb->transfer_buffer =
+                       kmalloc(MAX_DATA_BUFFER_SIZE, GFP_KERNEL)) == NULL) {
+                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Can't allocate Rx buffer for index %d\n", i);
                        return -ENOMEM;
                }
                psIntfAdapter->asUsbRcb[i].urb->transfer_buffer_length = MAX_DATA_BUFFER_SIZE;
@@ -372,77 +307,41 @@ static __inline int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
        return 0;
 }
 
-
-
 static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
-       INT value = 0;
+       int value = 0;
        UINT status = STATUS_SUCCESS;
 
        status = InitCardAndDownloadFirmware(psIntfAdapter->psAdapter);
-       if(status != STATUS_SUCCESS)
-       {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "InitCardAndDownloadFirmware failed.\n");
+       if (status != STATUS_SUCCESS) {
+               pr_err(DRV_NAME "InitCardAndDownloadFirmware failed.\n");
                return status;
        }
-       if(TRUE == psIntfAdapter->psAdapter->fw_download_done)
-       {
-
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Sending first interrupt URB down......");
-               if(StartInterruptUrb(psIntfAdapter))
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Cannot send interrupt in URB");
+       if (TRUE == psIntfAdapter->psAdapter->fw_download_done) {
+               if (StartInterruptUrb(psIntfAdapter)) {
+                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                       "Cannot send interrupt in URB\n");
                }
-               //now register the cntrl interface.
-               //after downloading the f/w waiting for 5 sec to get the mailbox interrupt.
 
+               /*
+                * now register the cntrl interface.
+                * after downloading the f/w waiting for 5 sec to get the mailbox interrupt.
+                */
                psIntfAdapter->psAdapter->waiting_to_fw_download_done = FALSE;
                value = wait_event_timeout(psIntfAdapter->psAdapter->ioctl_fw_dnld_wait_queue,
                                        psIntfAdapter->psAdapter->waiting_to_fw_download_done, 5*HZ);
 
-               if(value == 0)
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Mailbox Interrupt has not reached to Driver..");
-               }
-               else
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Got the mailbox interrupt ...Registering control interface...\n ");
-               }
-               if(register_control_device_interface(psIntfAdapter->psAdapter) < 0)
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Register Control Device failed...");
+               if (value == 0)
+                       pr_err(DRV_NAME ": Timeout waiting for mailbox interrupt.\n");
+
+               if (register_control_device_interface(psIntfAdapter->psAdapter) < 0) {
+                       pr_err(DRV_NAME ": Register Control Device failed.\n");
                        return -EIO;
                }
        }
        return 0;
 }
 
-#if 0
-static void    print_usb_interface_desc(struct usb_interface_descriptor *usb_intf_desc)
-{
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** INTERFACE DESCRIPTOR *********************");
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength: %x", usb_intf_desc->bLength);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType: %x", usb_intf_desc->bDescriptorType);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceNumber: %x", usb_intf_desc->bInterfaceNumber);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bAlternateSetting: %x", usb_intf_desc->bAlternateSetting);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bNumEndpoints: %x", usb_intf_desc->bNumEndpoints);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceClass: %x", usb_intf_desc->bInterfaceClass);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceSubClass: %x", usb_intf_desc->bInterfaceSubClass);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceProtocol: %x", usb_intf_desc->bInterfaceProtocol);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "iInterface :%x\n",usb_intf_desc->iInterface);
-}
-static void    print_usb_endpoint_descriptor(struct usb_endpoint_descriptor *usb_ep_desc)
-{
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** ENDPOINT DESCRIPTOR *********************");
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength  :%x ", usb_ep_desc->bLength);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType  :%x ", usb_ep_desc->bDescriptorType);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bEndpointAddress  :%x ", usb_ep_desc->bEndpointAddress);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bmAttributes  :%x ", usb_ep_desc->bmAttributes);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "wMaxPacketSize  :%x ",usb_ep_desc->wMaxPacketSize);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterval  :%x ",usb_ep_desc->bInterval);
-}
-
-#endif
 
 static inline int bcm_usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
 {
@@ -518,124 +417,111 @@ static inline int bcm_usb_endpoint_is_isoc_out(const struct usb_endpoint_descrip
        return (bcm_usb_endpoint_xfer_isoc(epd) && bcm_usb_endpoint_dir_out(epd));
 }
 
-INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
        struct usb_host_interface *iface_desc;
        struct usb_endpoint_descriptor *endpoint;
        size_t buffer_size;
-       ULONG value;
-       INT retval = 0;
-       INT usedIntOutForBulkTransfer = 0 ;
+       unsigned long value;
+       int retval = 0;
+       int usedIntOutForBulkTransfer = 0 ;
        BOOLEAN bBcm16 = FALSE;
        UINT uiData = 0;
 
        /* Store the usb dev into interface adapter */
-       psIntfAdapter->udev = usb_get_dev(interface_to_usbdev(
-                                                               psIntfAdapter->interface));
-
-       if((psIntfAdapter->udev->speed == USB_SPEED_HIGH))
-       {
-               psIntfAdapter->bHighSpeedDevice = TRUE ;
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "MODEM IS CONFIGURED TO HIGH_SPEED ");
-       }
-       else
-       {
-               psIntfAdapter->bHighSpeedDevice = FALSE ;
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "MODEM IS CONFIGURED TO FULL_SPEED ");
-       }
+       psIntfAdapter->udev = usb_get_dev(interface_to_usbdev(psIntfAdapter->interface));
 
+       psIntfAdapter->bHighSpeedDevice = (psIntfAdapter->udev->speed == USB_SPEED_HIGH);
        psIntfAdapter->psAdapter->interface_rdm = BcmRDM;
        psIntfAdapter->psAdapter->interface_wrm = BcmWRM;
 
-       if(rdmalt(psIntfAdapter->psAdapter, CHIP_ID_REG, (PUINT)&(psIntfAdapter->psAdapter->chip_id), sizeof(UINT)) < 0)
-       {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "CHIP ID Read Failed\n");
-               return STATUS_FAILURE;
-       }
-    if(0xbece3200==(psIntfAdapter->psAdapter->chip_id&~(0xF0)))
-       {
-               psIntfAdapter->psAdapter->chip_id=(psIntfAdapter->psAdapter->chip_id&~(0xF0));
+       retval = rdmalt(psIntfAdapter->psAdapter, CHIP_ID_REG,
+                       (u32 *)&(psIntfAdapter->psAdapter->chip_id), sizeof(u32));
+       if (retval) {
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "CHIP ID Read Failed\n");
+               return retval;
        }
 
-       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "First RDM Chip ID 0x%lx\n", psIntfAdapter->psAdapter->chip_id);
+       if (0xbece3200 == (psIntfAdapter->psAdapter->chip_id & ~(0xF0)))
+               psIntfAdapter->psAdapter->chip_id &= ~0xF0;
 
-    iface_desc = psIntfAdapter->interface->cur_altsetting;
-       //print_usb_interface_desc(&(iface_desc->desc));
+       dev_info(&psIntfAdapter->udev->dev, "RDM Chip ID 0x%lx\n",
+                psIntfAdapter->psAdapter->chip_id);
 
-       if(psIntfAdapter->psAdapter->chip_id == T3B)
-       {
+       iface_desc = psIntfAdapter->interface->cur_altsetting;
 
-               //
-               //T3B device will have EEPROM,check if EEPROM is proper and BCM16 can be done or not.
-               //
-               BeceemEEPROMBulkRead(psIntfAdapter->psAdapter,&uiData,0x0,4);
-               if(uiData == BECM)
-               {
+       if (psIntfAdapter->psAdapter->chip_id == T3B) {
+               /* T3B device will have EEPROM, check if EEPROM is proper and BCM16 can be done or not. */
+               BeceemEEPROMBulkRead(psIntfAdapter->psAdapter, &uiData, 0x0, 4);
+               if (uiData == BECM)
                        bBcm16 = TRUE;
-               }
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Number of Altsetting aviailable for This Modem 0x%x\n", psIntfAdapter->interface->num_altsetting);
-               if(bBcm16 == TRUE)
-               {
-                       //selecting alternate setting one as a default setting for High Speed  modem.
-                       if(psIntfAdapter->bHighSpeedDevice)
-                               retval= usb_set_interface(psIntfAdapter->udev,DEFAULT_SETTING_0,ALTERNATE_SETTING_1);
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "BCM16 is Applicable on this dongle");
-                       if(retval || (psIntfAdapter->bHighSpeedDevice == FALSE))
-                       {
+
+               dev_info(&psIntfAdapter->udev->dev, "number of alternate setting %d\n",
+                        psIntfAdapter->interface->num_altsetting);
+
+               if (bBcm16 == TRUE) {
+                       /* selecting alternate setting one as a default setting for High Speed  modem. */
+                       if (psIntfAdapter->bHighSpeedDevice)
+                               retval= usb_set_interface(psIntfAdapter->udev, DEFAULT_SETTING_0, ALTERNATE_SETTING_1);
+                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                               "BCM16 is applicable on this dongle\n");
+                       if (retval || (psIntfAdapter->bHighSpeedDevice == FALSE)) {
                                usedIntOutForBulkTransfer = EP2 ;
                                endpoint = &iface_desc->endpoint[EP2].desc;
-                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Interface altsetting  got failed or Moemd is configured to FS.hence will work on default setting 0 \n");
+                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                        "Interface altsetting failed or modem is configured to Full Speed, hence will work on default setting 0\n");
                                /*
-                               If Modem is high speed device EP2 should be INT OUT End point
-                               If Mode is FS then EP2 should be bulk end point
-                               */
-                               if(((psIntfAdapter->bHighSpeedDevice ==TRUE ) && (bcm_usb_endpoint_is_int_out(endpoint)== FALSE))
-                                       ||((psIntfAdapter->bHighSpeedDevice == FALSE)&& (bcm_usb_endpoint_is_bulk_out(endpoint)== FALSE)))
-                               {
-                                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Configuring the EEPROM ");
-                                       //change the EP2, EP4 to INT OUT end point
+                                * If Modem is high speed device EP2 should be INT OUT End point
+                                * If Mode is FS then EP2 should be bulk end point
+                                */
+                               if (((psIntfAdapter->bHighSpeedDevice == TRUE) && (bcm_usb_endpoint_is_int_out(endpoint) == FALSE))
+                                       || ((psIntfAdapter->bHighSpeedDevice == FALSE) && (bcm_usb_endpoint_is_bulk_out(endpoint) == FALSE))) {
+                                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                               "Configuring the EEPROM\n");
+                                       /* change the EP2, EP4 to INT OUT end point */
                                        ConfigureEndPointTypesThroughEEPROM(psIntfAdapter->psAdapter);
 
                                        /*
-                                       It resets the device and if any thing gets changed in USB descriptor it will show fail and
-                                       re-enumerate the device
-                                       */
+                                        * It resets the device and if any thing gets changed
+                                        *  in USB descriptor it will show fail and re-enumerate
+                                        * the device
+                                        */
                                        retval = usb_reset_device(psIntfAdapter->udev);
-                                       if(retval)
-                                       {
-                                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "reset got failed. hence Re-enumerating the device \n");
+                                       if (retval) {
+                                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                                       "reset failed.  Re-enumerating the device.\n");
                                                return retval ;
                                        }
 
                                }
-                               if((psIntfAdapter->bHighSpeedDevice == FALSE) && bcm_usb_endpoint_is_bulk_out(endpoint))
-                               {
-                                       // Once BULK is selected in FS mode. Revert it back to INT. Else USB_IF will fail.
+                               if ((psIntfAdapter->bHighSpeedDevice == FALSE) && bcm_usb_endpoint_is_bulk_out(endpoint)) {
+                                       /* Once BULK is selected in FS mode. Revert it back to INT. Else USB_IF will fail. */
                                        UINT _uiData = ntohl(EP2_CFG_INT);
-                                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Reverting Bulk to INT as it is FS MODE");
-                                       BeceemEEPROMBulkWrite(psIntfAdapter->psAdapter,(PUCHAR)&_uiData,0x136,4,TRUE);
+                                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, 
+                                               "Reverting Bulk to INT as it is in Full Speed mode.\n");
+                                       BeceemEEPROMBulkWrite(psIntfAdapter->psAdapter, (PUCHAR)&_uiData, 0x136, 4, TRUE);
                                }
-                       }
-                       else
-                       {
+                       } else {
                                usedIntOutForBulkTransfer = EP4 ;
                                endpoint = &iface_desc->endpoint[EP4].desc;
-                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Choosing AltSetting as a default setting");
-                               if( bcm_usb_endpoint_is_int_out(endpoint) == FALSE)
-                               {
-                                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, " Dongle does not have BCM16 Fix");
-                                       //change the EP2, EP4 to INT OUT end point and use EP4 in altsetting
+                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                       "Choosing AltSetting as a default setting.\n");
+                               if (bcm_usb_endpoint_is_int_out(endpoint) == FALSE) {
+                                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                               "Dongle does not have BCM16 Fix.\n");
+                                       /* change the EP2, EP4 to INT OUT end point and use EP4 in altsetting */
                                        ConfigureEndPointTypesThroughEEPROM(psIntfAdapter->psAdapter);
 
                                        /*
-                                       It resets the device and if any thing gets changed in USB descriptor it will show fail and
-                                       re-enumerate the device
-                                       */
+                                        * It resets the device and if any thing gets changed in
+                                        *  USB descriptor it will show fail and re-enumerate the
+                                        * device
+                                        */
                                        retval = usb_reset_device(psIntfAdapter->udev);
-                                       if(retval)
-                                       {
-                                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "reset got failed. hence Re-enumerating the device \n");
-                                               return retval ;
+                                       if (retval) {
+                                               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                                       "reset failed.  Re-enumerating the device.\n");
+                                               return retval;
                                        }
 
                                }
@@ -644,99 +530,67 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
        }
 
        iface_desc = psIntfAdapter->interface->cur_altsetting;
-       //print_usb_interface_desc(&(iface_desc->desc));
-       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Current number of endpoints :%x \n", iface_desc->desc.bNumEndpoints);
-    for (value = 0; value < iface_desc->desc.bNumEndpoints; ++value)
-       {
-        endpoint = &iface_desc->endpoint[value].desc;
-               //print_usb_endpoint_descriptor(endpoint);
-
-        if (!psIntfAdapter->sBulkIn.bulk_in_endpointAddr && bcm_usb_endpoint_is_bulk_in(endpoint))
-        {
-            buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-            psIntfAdapter->sBulkIn.bulk_in_size = buffer_size;
-            psIntfAdapter->sBulkIn.bulk_in_endpointAddr =
-                                                               endpoint->bEndpointAddress;
-               psIntfAdapter->sBulkIn.bulk_in_pipe =
+
+       for (value = 0; value < iface_desc->desc.bNumEndpoints; ++value) {
+               endpoint = &iface_desc->endpoint[value].desc;
+
+               if (!psIntfAdapter->sBulkIn.bulk_in_endpointAddr && bcm_usb_endpoint_is_bulk_in(endpoint)) {
+                       buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                       psIntfAdapter->sBulkIn.bulk_in_size = buffer_size;
+                       psIntfAdapter->sBulkIn.bulk_in_endpointAddr = endpoint->bEndpointAddress;
+                       psIntfAdapter->sBulkIn.bulk_in_pipe =
                                        usb_rcvbulkpipe(psIntfAdapter->udev,
                                                                psIntfAdapter->sBulkIn.bulk_in_endpointAddr);
-        }
-
-        if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr && bcm_usb_endpoint_is_bulk_out(endpoint))
-        {
+               }
 
-                       psIntfAdapter->sBulkOut.bulk_out_endpointAddr =
-                                                                               endpoint->bEndpointAddress;
-               psIntfAdapter->sBulkOut.bulk_out_pipe =
-                       usb_sndbulkpipe(psIntfAdapter->udev,
+               if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr && bcm_usb_endpoint_is_bulk_out(endpoint)) {
+                       psIntfAdapter->sBulkOut.bulk_out_endpointAddr = endpoint->bEndpointAddress;
+                       psIntfAdapter->sBulkOut.bulk_out_pipe =
+                               usb_sndbulkpipe(psIntfAdapter->udev,
                                        psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
-        }
-
-        if (!psIntfAdapter->sIntrIn.int_in_endpointAddr && bcm_usb_endpoint_is_int_in(endpoint))
-        {
-            buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-            psIntfAdapter->sIntrIn.int_in_size = buffer_size;
-            psIntfAdapter->sIntrIn.int_in_endpointAddr =
-                                                               endpoint->bEndpointAddress;
-            psIntfAdapter->sIntrIn.int_in_interval = endpoint->bInterval;
-            psIntfAdapter->sIntrIn.int_in_buffer =
+               }
+
+               if (!psIntfAdapter->sIntrIn.int_in_endpointAddr && bcm_usb_endpoint_is_int_in(endpoint)) {
+                       buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                       psIntfAdapter->sIntrIn.int_in_size = buffer_size;
+                       psIntfAdapter->sIntrIn.int_in_endpointAddr = endpoint->bEndpointAddress;
+                       psIntfAdapter->sIntrIn.int_in_interval = endpoint->bInterval;
+                       psIntfAdapter->sIntrIn.int_in_buffer =
                                                kmalloc(buffer_size, GFP_KERNEL);
-            if (!psIntfAdapter->sIntrIn.int_in_buffer) {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Could not allocate interrupt_in_buffer");
-                return -EINVAL;
-            }
-                       //psIntfAdapter->sIntrIn.int_in_pipe =
-        }
-
-        if (!psIntfAdapter->sIntrOut.int_out_endpointAddr && bcm_usb_endpoint_is_int_out(endpoint))
-        {
-
-                       if( !psIntfAdapter->sBulkOut.bulk_out_endpointAddr &&
-                               (psIntfAdapter->psAdapter->chip_id == T3B) && (value == usedIntOutForBulkTransfer))
-                       {
-                               //use first intout end point as a bulk out end point
-               buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-               psIntfAdapter->sBulkOut.bulk_out_size = buffer_size;
-                               //printk("\nINT OUT Endpoing buffer size :%x endpoint :%x\n", buffer_size, value +1);
-                               psIntfAdapter->sBulkOut.bulk_out_endpointAddr =
-                                                                               endpoint->bEndpointAddress;
-                       psIntfAdapter->sBulkOut.bulk_out_pipe =
-                               usb_sndintpipe(psIntfAdapter->udev,
-                                       psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
-                       psIntfAdapter->sBulkOut.int_out_interval = endpoint->bInterval;
+                       if (!psIntfAdapter->sIntrIn.int_in_buffer) {
+                               dev_err(&psIntfAdapter->udev->dev,
+                                       "could not allocate interrupt_in_buffer\n");
+                               return -EINVAL;
+                       }
+               }
 
+               if (!psIntfAdapter->sIntrOut.int_out_endpointAddr && bcm_usb_endpoint_is_int_out(endpoint)) {
+                       if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr &&
+                               (psIntfAdapter->psAdapter->chip_id == T3B) && (value == usedIntOutForBulkTransfer)) {
+                               /* use first intout end point as a bulk out end point */
+                               buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                               psIntfAdapter->sBulkOut.bulk_out_size = buffer_size;
+                               psIntfAdapter->sBulkOut.bulk_out_endpointAddr = endpoint->bEndpointAddress;
+                               psIntfAdapter->sBulkOut.bulk_out_pipe = usb_sndintpipe(psIntfAdapter->udev,
+                                                                       psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
+                               psIntfAdapter->sBulkOut.int_out_interval = endpoint->bInterval;
+                       } else if (value == EP6) {
+                               buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                               psIntfAdapter->sIntrOut.int_out_size = buffer_size;
+                               psIntfAdapter->sIntrOut.int_out_endpointAddr = endpoint->bEndpointAddress;
+                               psIntfAdapter->sIntrOut.int_out_interval = endpoint->bInterval;
+                               psIntfAdapter->sIntrOut.int_out_buffer= kmalloc(buffer_size, GFP_KERNEL);
+                               if (!psIntfAdapter->sIntrOut.int_out_buffer) {
+                                       dev_err(&psIntfAdapter->udev->dev,
+                                               "could not allocate interrupt_out_buffer\n");
+                                       return -EINVAL;
+                               }
                        }
-                       else if(value == EP6)
-                       {
-                   buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-                   psIntfAdapter->sIntrOut.int_out_size = buffer_size;
-                   psIntfAdapter->sIntrOut.int_out_endpointAddr =
-                                                                               endpoint->bEndpointAddress;
-                   psIntfAdapter->sIntrOut.int_out_interval = endpoint->bInterval;
-                   psIntfAdapter->sIntrOut.int_out_buffer= kmalloc(buffer_size,
-                                                                                                               GFP_KERNEL);
-                       if (!psIntfAdapter->sIntrOut.int_out_buffer)
-                                       {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Could not allocate interrupt_out_buffer");
-                       return -EINVAL;
-            }
-        }
-    }
-       }
-    usb_set_intfdata(psIntfAdapter->interface, psIntfAdapter);
-    retval = usb_register_dev(psIntfAdapter->interface, &usbbcm_class);
-       if(retval)
-       {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "usb register dev failed = %d", retval);
-               psIntfAdapter->psAdapter->bUsbClassDriverRegistered = FALSE;
-               return retval;
-       }
-       else
-       {
-               psIntfAdapter->psAdapter->bUsbClassDriverRegistered = TRUE;
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "usb dev registered");
+               }
        }
 
+       usb_set_intfdata(psIntfAdapter->interface, psIntfAdapter);
+
        psIntfAdapter->psAdapter->bcm_file_download = InterfaceFileDownload;
        psIntfAdapter->psAdapter->bcm_file_readback_from_chip =
                                InterfaceFileReadbackFromChip;
@@ -744,67 +598,51 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 
        retval = CreateInterruptUrb(psIntfAdapter);
 
-       if(retval)
-       {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cannot create interrupt urb");
+       if (retval) {
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
+                       "Cannot create interrupt urb\n");
                return retval;
        }
 
        retval = AllocUsbCb(psIntfAdapter);
-       if(retval)
-       {
+       if (retval)
                return retval;
-       }
-
 
-       retval = device_run(psIntfAdapter);
-       if(retval)
-       {
-               return retval;
-       }
-
-
-       return 0;
+       return device_run(psIntfAdapter);
 }
 
-static int InterfaceSuspend (struct usb_interface *intf, pm_message_t message)
+static int InterfaceSuspend(struct usb_interface *intf, pm_message_t message)
 {
        PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
-       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "=================================\n");
-       //Bcm_kill_all_URBs(psIntfAdapter);
+
        psIntfAdapter->bSuspended = TRUE;
 
-       if(TRUE == psIntfAdapter->bPreparingForBusSuspend)
-       {
+       if (TRUE == psIntfAdapter->bPreparingForBusSuspend) {
                psIntfAdapter->bPreparingForBusSuspend = FALSE;
 
-               if(psIntfAdapter->psAdapter->LinkStatus == LINKUP_DONE)
-               {
+               if (psIntfAdapter->psAdapter->LinkStatus == LINKUP_DONE) {
                        psIntfAdapter->psAdapter->IdleMode = TRUE ;
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Host Entered in PMU Idle Mode..");
-               }
-               else
-               {
+                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                               "Host Entered in PMU Idle Mode.\n");
+               } else {
                        psIntfAdapter->psAdapter->bShutStatus = TRUE;
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Host Entered in PMU Shutdown Mode..");
+                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                               "Host Entered in PMU Shutdown Mode.\n");
                }
        }
        psIntfAdapter->psAdapter->bPreparingForLowPowerMode = FALSE;
 
-       //Signaling the control pkt path
+       /* Signaling the control pkt path */
        wake_up(&psIntfAdapter->psAdapter->lowpower_mode_wait_queue);
 
        return 0;
 }
 
-static int InterfaceResume (struct usb_interface *intf)
+static int InterfaceResume(struct usb_interface *intf)
 {
-    PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
-       printk("=================================\n");
+       PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
        mdelay(100);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
-       intf->pm_usage_cnt =1 ;
-#endif
+
        psIntfAdapter->bSuspended = FALSE;
 
        StartInterruptUrb(psIntfAdapter);
@@ -812,57 +650,41 @@ static int InterfaceResume (struct usb_interface *intf)
        return 0;
 }
 
-static int InterfacePreReset(struct usb_interface *intf)
-{
-    printk("====================>");
-       return STATUS_SUCCESS;
-}
-
-static int InterfacePostReset(struct usb_interface *intf)
-{
-    printk("Do Post chip reset setting here if it is required");
-       return STATUS_SUCCESS;
-}
 static struct usb_driver usbbcm_driver = {
-    .name = "usbbcm",
-    .probe = usbbcm_device_probe,
-    .disconnect = usbbcm_disconnect,
-    .suspend = InterfaceSuspend,
-    .resume = InterfaceResume,
-       .pre_reset=InterfacePreReset,
-       .post_reset=InterfacePostReset,
-    .id_table = InterfaceUsbtable,
-    .supports_autosuspend = 1,
+       .name = "usbbcm",
+       .probe = usbbcm_device_probe,
+       .disconnect = usbbcm_disconnect,
+       .suspend = InterfaceSuspend,
+       .resume = InterfaceResume,
+       .id_table = InterfaceUsbtable,
+       .supports_autosuspend = 1,
 };
 
+struct class *bcm_class;
 
-/*
-Function:                              InterfaceInitialize
-
-Description:                   This is the hardware specific initialization Function.
-                                               Registering the driver with NDIS , other device specific NDIS
-                                               and hardware initializations are done here.
-
-Input parameters:              IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
+static __init int bcm_init(void)
+{
+       printk(KERN_INFO "%s: %s, %s\n", DRV_NAME, DRV_DESCRIPTION, DRV_VERSION);
+       printk(KERN_INFO "%s\n", DRV_COPYRIGHT);
 
+       bcm_class = class_create(THIS_MODULE, DRV_NAME);
+       if (IS_ERR(bcm_class)) {
+               printk(KERN_ERR DRV_NAME ": could not create class\n");
+               return PTR_ERR(bcm_class);
+       }
 
-Return:                                        BCM_STATUS_SUCCESS - If Initialization of the
-                                               HW Interface was successful.
-                                               Other           - If an error occured.
-*/
-INT InterfaceInitialize(void)
-{
-//     BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Registering Usb driver!!");
        return usb_register(&usbbcm_driver);
 }
 
-INT InterfaceExit(void)
+static __exit void bcm_exit(void)
 {
-       //PMINI_ADAPTER psAdapter = NULL;
-       int status = 0;
-
-       //BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Deregistering Usb driver!!");
        usb_deregister(&usbbcm_driver);
-       return status;
+       class_destroy(bcm_class);
 }
-MODULE_LICENSE ("GPL");
+
+module_init(bcm_init);
+module_exit(bcm_exit);
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");