Merge 3.14-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8188eu / os_dep / usb_intf.c

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index a70dcef1419e9d9541b0414c9a3da8bf7380ca61..2e49cd583212a70dc3bf8bf1ed22eb5d12d0e068 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -26,6 +26,7 @@
 #include <hal_intf.h>
 #include <rtw_version.h>
 #include <linux/usb.h>
+#include <linux/vmalloc.h>
 #include <osdep_intf.h>
 
 #include <usb_vendor_req.h>
@@ -55,6 +56,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
        /****** 8188EUS ********/
        {USB_DEVICE(0x07b8, 0x8179)}, /* Abocom - Abocom */
        {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */
+       {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */
        {}      /* Terminating entry */
 };
 
@@ -161,7 +163,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
        struct usb_endpoint_descriptor  *pendp_desc;
        struct usb_device       *pusbd;
 
-_func_enter_;
 
        pdvobjpriv = (struct dvobj_priv *)rtw_zmalloc(sizeof(*pdvobjpriv));
        if (pdvobjpriv == NULL)
@@ -254,7 +255,6 @@ free_dvobj:
                pdvobjpriv = NULL;
        }
 exit:
-_func_exit_;
        return pdvobjpriv;
 }
 
@@ -262,7 +262,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
 {
        struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf);
 
-_func_enter_;
 
        usb_set_intfdata(usb_intf, NULL);
        if (dvobj) {
@@ -287,7 +286,6 @@ _func_enter_;
 
        usb_put_dev(interface_to_usbdev(usb_intf));
 
-_func_exit_;
 }
 
 static void chip_by_usb_id(struct adapter *padapter,
@@ -389,7 +387,6 @@ int rtw_hw_suspend(struct adapter *padapter)
        struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
        struct net_device *pnetdev = padapter->pnetdev;
 
-       _func_enter_;
 
        if ((!padapter->bup) || (padapter->bDriverStopped) ||
            (padapter->bSurpriseRemoved)) {
@@ -442,7 +439,6 @@ int rtw_hw_suspend(struct adapter *padapter)
        } else {
                goto error_exit;
        }
-       _func_exit_;
        return 0;
 
 error_exit:
@@ -455,7 +451,6 @@ int rtw_hw_resume(struct adapter *padapter)
        struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
        struct net_device *pnetdev = padapter->pnetdev;
 
-       _func_enter_;
 
        if (padapter) { /* system resume */
                DBG_88E("==> rtw_hw_resume\n");
@@ -487,7 +482,6 @@ int rtw_hw_resume(struct adapter *padapter)
                goto error_exit;
        }
 
-       _func_exit_;
 
        return 0;
 error_exit:
@@ -506,7 +500,6 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
        int ret = 0;
        u32 start_time = jiffies;
 
-       _func_enter_;
 
        DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
 
@@ -563,7 +556,6 @@ exit:
        DBG_88E("<===  %s return %d.............. in %dms\n", __func__
                , ret, rtw_get_passing_time_ms(start_time));
 
-       _func_exit_;
        return ret;
 }
 
@@ -587,7 +579,6 @@ int rtw_resume_process(struct adapter *padapter)
        struct pwrctrl_priv *pwrpriv = NULL;
        int ret = -1;
        u32 start_time = jiffies;
-       _func_enter_;
 
        DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
 
@@ -626,7 +617,6 @@ exit:
        DBG_88E("<===  %s return %d.............. in %dms\n", __func__,
                ret, rtw_get_passing_time_ms(start_time));
 
-       _func_exit_;
 
        return ret;
 }
@@ -646,7 +636,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
        struct net_device *pnetdev = NULL;
        int status = _FAIL;
 
-       padapter = (struct adapter *)rtw_zvmalloc(sizeof(*padapter));
+       padapter = (struct adapter *)vzalloc(sizeof(*padapter));
        if (padapter == NULL)
                goto exit;
        padapter->dvobj = dvobj;
@@ -746,7 +736,7 @@ free_adapter:
                if (pnetdev)
                        rtw_free_netdev(pnetdev);
                else if (padapter)
-                       rtw_vmfree((u8 *)padapter, sizeof(*padapter));
+                       vfree(padapter);
                padapter = NULL;
        }
 exit:
@@ -835,7 +825,6 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
        struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
        struct adapter *padapter = dvobj->if1;
 
-_func_enter_;
 
        DBG_88E("+rtw_dev_remove\n");
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+dev_remove()\n"));
@@ -854,7 +843,6 @@ _func_enter_;
 
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-dev_remove()\n"));
        DBG_88E("-r871xu_dev_remove, done\n");
-_func_exit_;
 
        return;
 }