staging: rtl8723au: Remove ugly vmalloc() wrappers

Finally with the last user converted, get rid of ugly vmalloc wrappers

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/osdep_service.h b/drivers/staging/rtl8723au/include/osdep_service.h
index 105e1c9..3ec2469 100644 (file)
--- a/drivers/staging/rtl8723au/include/osdep_service.h
+++ b/drivers/staging/rtl8723au/include/osdep_service.h
@@ -128,13 +128,6 @@ static inline u32 CHKBIT(u32 x)
 
 int RTW_STATUS_CODE23a(int error_code);
 
-u8*    _rtw_vmalloc(u32 sz);
-u8*    _rtw_zvmalloc(u32 sz);
-void   _rtw_vmfree(u8 *pbuf, u32 sz);
-#define rtw_vmalloc(sz)                        _rtw_vmalloc((sz))
-#define rtw_zvmalloc(sz)                       _rtw_zvmalloc((sz))
-#define rtw_vmfree(pbuf, sz)           _rtw_vmfree((pbuf), (sz))
-
 extern unsigned char REALTEK_96B_IE23A[];
 extern unsigned char MCS_rate_2R23A[16];
 extern unsigned char WPA_TKIP_CIPHER23A[4];

diff --git a/drivers/staging/rtl8723au/os_dep/osdep_service.c b/drivers/staging/rtl8723au/os_dep/osdep_service.c
index 9138a17..68fa7a8 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723au/os_dep/osdep_service.c
@@ -19,7 +19,6 @@
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>
-#include <linux/vmalloc.h>
 
 /*
 * Translate the OS dependent @param error_code to OS independent RTW_STATUS_CODE23a
@@ -32,29 +31,6 @@ inline int RTW_STATUS_CODE23a(int error_code)
        return _FAIL;
 }
 
-inline u8 *_rtw_vmalloc(u32 sz)
-{
-       u8      *pbuf;
-       pbuf = vmalloc(sz);
-
-       return pbuf;
-}
-
-inline u8 *_rtw_zvmalloc(u32 sz)
-{
-       u8      *pbuf;
-       pbuf = _rtw_vmalloc(sz);
-       if (pbuf != NULL)
-               memset(pbuf, 0, sz);
-
-       return pbuf;
-}
-
-inline void _rtw_vmfree(u8 *pbuf, u32 sz)
-{
-       vfree(pbuf);
-}
-
 void _rtw_init_queue23a(struct rtw_queue *pqueue)
 {
        INIT_LIST_HEAD(&pqueue->queue);