Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8188eu / os_dep / osdep_service.c

diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 764250b4ba861b7b512ff72dbaeb9e8585ab25ba..7cd2655f27fe1952e28e92c28f90e0f96ecfce72 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -55,21 +55,13 @@ void *rtw_malloc2d(int h, int w, int size)
        return a;
 }
 
-u32 _rtw_down_sema(struct semaphore *sema)
-{
-       if (down_interruptible(sema))
-               return _FAIL;
-       return _SUCCESS;
-}
-
 void   _rtw_init_queue(struct __queue *pqueue)
 {
        INIT_LIST_HEAD(&(pqueue->queue));
        spin_lock_init(&(pqueue->lock));
 }
 
-struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
-                                                   void *old_priv)
+struct net_device *rtw_alloc_etherdev_with_old_priv(void *old_priv)
 {
        struct net_device *pnetdev;
        struct rtw_netdev_priv_indicator *pnpi;
@@ -80,7 +72,6 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
 
        pnpi = netdev_priv(pnetdev);
        pnpi->priv = old_priv;
-       pnpi->sizeof_priv = sizeof_priv;
 
 RETURN:
        return pnetdev;