remove rtw_mfree2d() function

It is just a wrapper around kfree(), so remove it and just call kfree()
instead.

Adaptation of: https://lore.kernel.org/r/20210730092417.1014392-7-gregkh@linuxfoundation.org
This commit is contained in:
Greg Kroah-Hartman 2021-07-30 11:24:12 +02:00 committed by Carlos Garcés
parent 1401b54fd0
commit ac1790da7c
3 changed files with 2 additions and 9 deletions

View File

@ -1178,7 +1178,7 @@ Hal_EfusePowerSwitch8192E(
if (bWrite == _TRUE) { if (bWrite == _TRUE) {
/* Enable LDO 2.5V before read/write action */ /* Enable LDO 2.5V before read/write action */
tempval = rtw_read8(pAdapter, EFUSE_TEST + 3); tempval = rtw_read8(pAdapter, EFUSE_TEST + 3);
tempval &= 0x07; /* 0x34[30:27] = 4¡¦1110 => LDOE25 voltage select to 2.25V Suggested by SD1 Jackie & DD -Tm_lin */ tempval &= 0x07; /* 0x34[30:27] = 4<EFBFBD><EFBFBD>1110 => LDOE25 voltage select to 2.25V Suggested by SD1 Jackie & DD -Tm_lin */
/* tempval |= (VOLTAGE_V25 << 4); */ /* tempval |= (VOLTAGE_V25 << 4); */
tempval |= 0x70; tempval |= 0x70;
rtw_write8(pAdapter, EFUSE_TEST + 3, (tempval | 0x80)); rtw_write8(pAdapter, EFUSE_TEST + 3, (tempval | 0x80));
@ -1429,8 +1429,7 @@ exit:
if (efuseTbl) if (efuseTbl)
rtw_mfree(efuseTbl, EFUSE_MAP_LEN_8192E); rtw_mfree(efuseTbl, EFUSE_MAP_LEN_8192E);
if (eFuseWord) kfree(eFuseWord);
rtw_mfree2d((void *)eFuseWord, EFUSE_MAX_SECTION_8192E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
} }
static VOID static VOID

View File

@ -288,7 +288,6 @@ void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_a
#endif /* DBG_MEM_ALLOC */ #endif /* DBG_MEM_ALLOC */
extern void *rtw_malloc2d(int h, int w, size_t size); extern void *rtw_malloc2d(int h, int w, size_t size);
extern void rtw_mfree2d(void *pbuf, int h, int w, int size);
void rtw_os_pkt_free(_pkt *pkt); void rtw_os_pkt_free(_pkt *pkt);
_pkt *rtw_os_pkt_copy(_pkt *pkt); _pkt *rtw_os_pkt_copy(_pkt *pkt);

View File

@ -873,11 +873,6 @@ void *rtw_malloc2d(int h, int w, size_t size)
return a; return a;
} }
void rtw_mfree2d(void *pbuf, int h, int w, int size)
{
rtw_mfree((u8 *)pbuf, h * sizeof(void *) + w * h * size);
}
inline void rtw_os_pkt_free(_pkt *pkt) inline void rtw_os_pkt_free(_pkt *pkt)
{ {
#if defined(PLATFORM_LINUX) #if defined(PLATFORM_LINUX)