diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 22:37:12 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 22:37:12 (GMT) |
| commit | 70128792b7802efcf485e9b62249cf8a639187d8 (patch) | |
| tree | 22453e906c9796628b84256944786db506450cf3 /drivers/staging/csr/csr_wifi_hip_download.c | |
| parent | 4fe9db37104f833972486355fe86d7dcd29279b5 (diff) | |
| download | linux-fsl-qoriq-70128792b7802efcf485e9b62249cf8a639187d8.tar.xz | |
staging: csr: remove CsrMemAlloc()
It's just calling kmalloc(, GFP_KERNEL), so call that instead.
A few places should be calling kzalloc(), so do that, and remove the
call to memset at the same time.
Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_hip_download.c')
| -rw-r--r-- | drivers/staging/csr/csr_wifi_hip_download.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c index 1a1dfb6..f0f0ffd 100644 --- a/drivers/staging/csr/csr_wifi_hip_download.c +++ b/drivers/staging/csr/csr_wifi_hip_download.c @@ -327,7 +327,7 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv) func_enter(); - fwinfo = CsrMemAlloc(sizeof(xbv1_t)); + fwinfo = kmalloc(sizeof(xbv1_t), GFP_KERNEL); if (fwinfo == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for firmware\n"); @@ -409,7 +409,7 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) unifi_info(card->ospriv, "unifi_dl_patch %p %08x\n", dlpriv, boot_ctrl); - fwinfo = CsrMemAlloc(sizeof(xbv1_t)); + fwinfo = kmalloc(sizeof(xbv1_t), GFP_KERNEL); if (fwinfo == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for patches\n"); |