convert only rtw_vmalloc call to vmalloc

Convert the only call to rtw_vmalloc in os_dep/ioctl_linux.c to the
kernel's existing vmalloc function, as rtw_malloc is just a preprocessor
definition for _rtw_vmalloc. The _rtw_vmalloc function is defined inline
and returns a u8, wrapping standard vmalloc. This behaviour is not necessary.

Link: https://lore.kernel.org/r/20210818234853.208448-2-phil@philpotter.co.uk
This commit is contained in:
Phillip Potter 2021-08-19 00:48:47 +01:00 committed by Carlos Garcés
parent 76cefd5ae2
commit 397bbaeacf
2 changed files with 6 additions and 6 deletions

View File

@ -3144,9 +3144,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;
} }
@ -3156,9 +3156,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;
} }
memset(map, 0xff, map_size); memset(map, 0xff, map_size);

View File

@ -7838,7 +7838,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;
@ -7850,7 +7850,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) {
vfree(ext); vfree(ext);
return -ENOMEM; return -ENOMEM;