Staging: wilc1000: Use kzalloc instead of kmalloc and memset

Replace kmalloc and memset with a single call to kzalloc.

Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 392bf08..706b27d 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1867,15 +1867,13 @@ static int Handle_Key(struct host_if_drv *hif_drv,
 
        case WPARxGtk:
                if (pstrHostIFkeyAttr->action & ADDKEY_AP) {
-                       pu8keybuf = kmalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
+                       pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
                        if (pu8keybuf == NULL) {
                                PRINT_ER("No buffer to send RxGTK Key\n");
                                ret = -1;
                                goto _WPARxGtk_end_case_;
                        }
 
-                       memset(pu8keybuf, 0, RX_MIC_KEY_MSG_LEN);
-
                        if (pstrHostIFkeyAttr->attr.wpa.seq != NULL)
                                memcpy(pu8keybuf + 6, pstrHostIFkeyAttr->attr.wpa.seq, 8);
 
@@ -1904,15 +1902,13 @@ static int Handle_Key(struct host_if_drv *hif_drv,
                if (pstrHostIFkeyAttr->action & ADDKEY) {
                        PRINT_D(HOSTINF_DBG, "Handling group key(Rx) function\n");
 
-                       pu8keybuf = kmalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
+                       pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
                        if (pu8keybuf == NULL) {
                                PRINT_ER("No buffer to send RxGTK Key\n");
                                ret = -1;
                                goto _WPARxGtk_end_case_;
                        }
 
-                       memset(pu8keybuf, 0, RX_MIC_KEY_MSG_LEN);
-
                        if (hif_drv->enuHostIFstate == HOST_IF_CONNECTED)
                                memcpy(pu8keybuf, hif_drv->au8AssociatedBSSID, ETH_ALEN);
                        else
@@ -4936,9 +4932,8 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
        pu8IEs = ptstrNetworkInfo->pu8IEs;
        u16IEsLen = ptstrNetworkInfo->u16IEsLen;
 
-       pNewJoinBssParam = kmalloc(sizeof(struct join_bss_param), GFP_KERNEL);
+       pNewJoinBssParam = kzalloc(sizeof(struct join_bss_param), GFP_KERNEL);
        if (pNewJoinBssParam != NULL) {
-               memset(pNewJoinBssParam, 0, sizeof(struct join_bss_param));
                pNewJoinBssParam->dtim_period = ptstrNetworkInfo->u8DtimPeriod;
                pNewJoinBssParam->beacon_period = ptstrNetworkInfo->u16BeaconPeriod;
                pNewJoinBssParam->cap_info = ptstrNetworkInfo->u16CapInfo;