sim1222/rtl8188eus
1
0
Fork 0
mirror of https://github.com/drygdryg/rtl8188eus.git synced 2025-04-29 02:37:16 +09:00
Code Issues Projects Releases Wiki Activity

Remove wrappers around vmalloc()

Browse Source
This commit is contained in:
kimocoder 2019-02-14 17:59:53 +01:00
parent 78b58d1213
commit d30cd10cf0
4 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/efuse/rtw_efuse.c
View File

@ -3091,9 +3091,9 @@ u32 rtw_read_efuse_from_file(const char *path, u8 *buf, int map_size)
goto exit; goto exit;
} }
file_data = rtw_vmalloc(file_size); file_data = vmalloc(file_size);
if (!file_data) { if (!file_data) {
RTW_ERR("%s rtw_vmalloc(%d) fail\n", __func__, file_size); RTW_ERR("%s vmalloc(%d) fail\n", __func__, file_size);
goto exit; goto exit;
} }
@ -3103,9 +3103,9 @@ u32 rtw_read_efuse_from_file(const char *path, u8 *buf, int map_size)
goto exit; goto exit;
} }
map = rtw_vmalloc(map_size); map = vmalloc(map_size);
if (!map) { if (!map) {
RTW_ERR("%s rtw_vmalloc(%d) fail\n", __func__, map_size); RTW_ERR("%s vmalloc(%d) fail\n", __func__, map_size);
goto exit; goto exit;
} }
_rtw_memset(map, 0xff, map_size); _rtw_memset(map, 0xff, map_size);

4
include/osdep_service.h
View File

@ -166,21 +166,18 @@ void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dm
#endif /* CONFIG_USB_HCI */ #endif /* CONFIG_USB_HCI */
#ifdef CONFIG_USE_VMALLOC #ifdef CONFIG_USE_VMALLOC
#define rtw_vmalloc(sz) dbg_rtw_vmalloc((sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__)
#define rtw_zvmalloc(sz) dbg_rtw_zvmalloc((sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_zvmalloc(sz) dbg_rtw_zvmalloc((sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__)
#define rtw_vmfree(pbuf, sz) dbg_rtw_vmfree((pbuf), (sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_vmfree(pbuf, sz) dbg_rtw_vmfree((pbuf), (sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__)
#define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_vmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_vmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__)
#define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zvmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zvmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__)
#define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_vmfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_vmfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__)
#else /* CONFIG_USE_VMALLOC */ #else /* CONFIG_USE_VMALLOC */
#define rtw_vmalloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_zvmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_zvmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_vmfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_vmfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#endif /* CONFIG_USE_VMALLOC */ #endif /* CONFIG_USE_VMALLOC */
#define rtw_malloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_zmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_zmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_mfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_mfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
#define rtw_malloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_malloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__)
@ -214,7 +211,6 @@ void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dm
#define rtw_mstat_update(flag, status, sz) do {} while (0) #define rtw_mstat_update(flag, status, sz) do {} while (0)
#define rtw_mstat_dump(sel) do {} while (0) #define rtw_mstat_dump(sel) do {} while (0)
#define match_mstat_sniff_rules(flags, size) _FALSE #define match_mstat_sniff_rules(flags, size) _FALSE
void *_rtw_vmalloc(u32 sz);
void *_rtw_zvmalloc(u32 sz); void *_rtw_zvmalloc(u32 sz);
void _rtw_vmfree(void *pbuf, u32 sz); void _rtw_vmfree(void *pbuf, u32 sz);
void *_rtw_zmalloc(u32 sz); void *_rtw_zmalloc(u32 sz);

4
os_dep/linux/ioctl_linux.c
View File

@ -7880,7 +7880,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
return -EFAULT; return -EFAULT;
len = dwrq->length; len = dwrq->length;
ext = rtw_vmalloc(len); ext = vmalloc(len);
if (!ext) if (!ext)
return -ENOMEM; return -ENOMEM;
@ -7892,7 +7892,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
#ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV
ext_dbg = rtw_vmalloc(len); ext_dbg = vmalloc(len);
if (!ext_dbg) { if (!ext_dbg) {
rtw_vmfree(ext, len); rtw_vmfree(ext, len);
return -ENOMEM; return -ENOMEM;

30
os_dep/osdep_service.c
View File

@ -73,37 +73,11 @@ u32 rtw_atoi(u8 *s)
} }
inline void *_rtw_vmalloc(u32 sz)
{
void *pbuf;
#ifdef PLATFORM_LINUX
pbuf = vmalloc(sz);
#endif
#ifdef PLATFORM_FREEBSD
pbuf = malloc(sz, M_DEVBUF, M_NOWAIT);
#endif
#ifdef PLATFORM_WINDOWS
NdisAllocateMemoryWithTag(&pbuf, sz, RT_TAG);
#endif
#ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX
if (pbuf != NULL) {
atomic_inc(&_malloc_cnt);
atomic_add(sz, &_malloc_size);
}
#endif
#endif /* DBG_MEMORY_LEAK */
return pbuf;
}
inline void *_rtw_zvmalloc(u32 sz) inline void *_rtw_zvmalloc(u32 sz)
{ {
void *pbuf; void *pbuf;
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
pbuf = _rtw_vmalloc(sz); pbuf = vmalloc(sz);
if (pbuf != NULL) if (pbuf != NULL)
memset(pbuf, 0, sz); memset(pbuf, 0, sz);
#endif #endif
@ -575,7 +549,7 @@ inline void *dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func,
if (match_mstat_sniff_rules(flags, sz)) if (match_mstat_sniff_rules(flags, sz))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz));
p = _rtw_vmalloc((sz)); p = vmalloc((sz));
rtw_mstat_update( rtw_mstat_update(
flags flags