diff options
| author | Joe Perches | 2017-09-09 22:14:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-09-17 16:35:26 +0200 |
| commit | 35628c4ad0f3800d3744fd5d4b7315e51c5e407e (patch) | |
| tree | 4f4163fbca9828e49673ccf76b6ef2ac0a12ea17 /drivers/staging/rtl8723bs/os_dep/osdep_service.c | |
| parent | staging: rtl8723bs: Convert LIST_CONTAINOR to use kernel container_of (diff) | |
| download | kernel-qcow2-linux-35628c4ad0f3800d3744fd5d4b7315e51c5e407e.tar.gz kernel-qcow2-linux-35628c4ad0f3800d3744fd5d4b7315e51c5e407e.tar.xz kernel-qcow2-linux-35628c4ad0f3800d3744fd5d4b7315e51c5e407e.zip | |
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/os_dep/osdep_service.c')
| -rw-r--r-- | drivers/staging/rtl8723bs/os_dep/osdep_service.c | 15 |
1 files changed, 5 insertions, 10 deletions
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; } |