diff options
author | Joe Perches <joe@perches.com> | 2017-09-09 23:14:52 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-17 17:35:26 +0300 |
commit | 35628c4ad0f3800d3744fd5d4b7315e51c5e407e (patch) | |
tree | 4f4163fbca9828e49673ccf76b6ef2ac0a12ea17 /drivers/staging/rtl8723bs | |
parent | 67af9094043dd064ec0c2cb0d84173cd9129cdc3 (diff) | |
download | linux-35628c4ad0f3800d3744fd5d4b7315e51c5e407e.tar.xz |
staging: rtl8723bs: convert private allocation functions to return void *
Using char * for a return from allocation functions means the
code has to cast generic allocations to specific types.
Allow the compiler to not need casts on the allocations.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs')
-rw-r--r-- | drivers/staging/rtl8723bs/include/osdep_service.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/os_dep/osdep_service.c | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h index ac9ffe0e3b84..57523baa4517 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service.h +++ b/drivers/staging/rtl8723bs/include/osdep_service.h @@ -96,8 +96,8 @@ typedef enum mstat_status{ #define rtw_mstat_update(flag, status, sz) do {} while (0) #define rtw_mstat_dump(sel) do {} while (0) -u8*_rtw_zmalloc(u32 sz); -u8*_rtw_malloc(u32 sz); +void *_rtw_zmalloc(u32 sz); +void *_rtw_malloc(u32 sz); void _kfree(u8 *pbuf, u32 sz); struct sk_buff *_rtw_skb_alloc(u32 sz); diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c index a05daf06a870..93747c2bce52 100644 --- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c +++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c @@ -30,22 +30,17 @@ inline int RTW_STATUS_CODE(int error_code) return _FAIL; } -u8 *_rtw_malloc(u32 sz) +void *_rtw_malloc(u32 sz) { - u8 *pbuf = NULL; - - pbuf = kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); - - return pbuf; + return kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); } -u8 *_rtw_zmalloc(u32 sz) +void *_rtw_zmalloc(u32 sz) { - u8 *pbuf = _rtw_malloc(sz); + void *pbuf = _rtw_malloc(sz); - if (pbuf != NULL) { + if (pbuf) memset(pbuf, 0, sz); - } return pbuf; } |