diff options
| author | ChengYi He <chengyihetaipei@gmail.com> | 2015-06-16 03:04:59 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-15 21:52:00 -0700 |
| commit | 30ef5c8b97d9dd381f94a919c21096afe6553f5d (patch) | |
| tree | 34997c5845f7a01aafda4a0c8829416bd5dccf9a /drivers/staging/wilc1000 | |
| parent | 3f5309725e08b2ce2395bcfea09eb518d3ddb499 (diff) | |
| download | talos-op-linux-30ef5c8b97d9dd381f94a919c21096afe6553f5d.tar.gz talos-op-linux-30ef5c8b97d9dd381f94a919c21096afe6553f5d.zip | |
staging: wilc1000: remove unnecessary cast
kmalloc() returns void pointer.
Signed-off-by: ChengYi He <chengyihetaipei@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/linux_mon.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c index d5860ce749e0..bc7feb459a7a 100644 --- a/drivers/staging/wilc1000/linux_mon.c +++ b/drivers/staging/wilc1000/linux_mon.c @@ -258,7 +258,7 @@ static int mon_mgmt_tx(struct net_device *dev, const u8 *buf, size_t len) len += sizeof(struct tx_complete_mon_data *); #endif - mgmt_tx->buff = (char *)kmalloc(len, GFP_ATOMIC); + mgmt_tx->buff = kmalloc(len, GFP_ATOMIC); if (mgmt_tx->buff == NULL) { PRINT_ER("Failed to allocate memory for mgmt_tx buff\n"); return WILC_FAIL; diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 5f871485d973..c1e92722a471 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -580,7 +580,7 @@ static void linux_wlan_dbg(uint8_t *buff) static void *linux_wlan_malloc_atomic(uint32_t sz) { char *pntr = NULL; - pntr = (char *)kmalloc(sz, GFP_ATOMIC); + pntr = kmalloc(sz, GFP_ATOMIC); PRINT_D(MEM_DBG, "Allocating %d bytes at address %p\n", sz, pntr); return (void *)pntr; @@ -588,7 +588,7 @@ static void *linux_wlan_malloc_atomic(uint32_t sz) static void *linux_wlan_malloc(uint32_t sz) { char *pntr = NULL; - pntr = (char *)kmalloc(sz, GFP_KERNEL); + pntr = kmalloc(sz, GFP_KERNEL); PRINT_D(MEM_DBG, "Allocating %d bytes at address %p\n", sz, pntr); return (void *)pntr; } @@ -605,7 +605,7 @@ void linux_wlan_free(void *vp) static void *internal_alloc(uint32_t size, uint32_t flag) { char *pntr = NULL; - pntr = (char *)kmalloc(size, flag); + pntr = kmalloc(size, flag); PRINT_D(MEM_DBG, "Allocating %d bytes at address %p\n", size, pntr); return (void *)pntr; } |
