OSDN Git Service

staging: r8188eu: Remove wrapper around mutex_destroy
authorLarry Finger <Larry.Finger@lwfinger.net>
Sun, 22 Dec 2013 23:36:42 +0000 (17:36 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2014 00:02:10 +0000 (16:02 -0800)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_xmit.c
drivers/staging/rtl8188eu/include/osdep_service.h
drivers/staging/rtl8188eu/os_dep/osdep_service.c
drivers/staging/rtl8188eu/os_dep/usb_intf.c

index b1af4ef..026645c 100644 (file)
@@ -277,7 +277,7 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
 
        rtw_free_hwxmits(padapter);
 
-       _rtw_mutex_free(&pxmitpriv->ack_tx_mutex);
+       mutex_destroy(&pxmitpriv->ack_tx_mutex);
 
 out:
 
index 3ea97fd..7956f0c 100644 (file)
@@ -257,7 +257,6 @@ void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead);
 void rtw_list_delete(struct list_head *plist);
 
 u32  _rtw_down_sema(struct semaphore *sema);
-void _rtw_mutex_free(struct mutex *pmutex);
 
 void _rtw_init_queue(struct __queue *pqueue);
 u32  _rtw_queue_empty(struct __queue *pqueue);
index 23d39cc..8c3b077 100644 (file)
@@ -169,11 +169,6 @@ u32 _rtw_down_sema(struct semaphore *sema)
                return _SUCCESS;
 }
 
-void   _rtw_mutex_free(struct mutex *pmutex)
-{
-       mutex_destroy(pmutex);
-}
-
 void   _rtw_init_queue(struct __queue *pqueue)
 {
        _rtw_init_listhead(&(pqueue->queue));
index 32d1e97..35107fd 100644 (file)
@@ -144,7 +144,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
        u8 rst = _SUCCESS;
 
        kfree(dvobj->usb_alloc_vendor_req_buf);
-       _rtw_mutex_free(&dvobj->usb_vendor_req_mutex);
+       mutex_destroy(&dvobj->usb_vendor_req_mutex);
        return rst;
 }
 
@@ -881,7 +881,7 @@ static void __exit rtw_drv_halt(void)
        usb_drv->drv_registered = false;
        usb_deregister(&usb_drv->usbdrv);
 
-       _rtw_mutex_free(&usb_drv->hw_init_mutex);
+       mutex_destroy(&usb_drv->hw_init_mutex);
        DBG_88E("-rtw_drv_halt\n");
 }