staging: wilc1000: removes function 'wilc_dealloc_assoc_resp_info()'

This patch removes function wilc_dealloc_assoc_resp_info()'.
Does not need this function which only free memory.
Therefore, this function is removed and changed directly with kfree.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 81dd22e9c5f684e118b0797052aaa87ba7c32775..c86278de8c414c99a8743b69adf2a40e3ad5789b 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -386,25 +386,3 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
 
        return 0;
 }
-
-s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *connect_resp_info)
-{
-       s32 result = 0;
-
-       if (connect_resp_info) {
-               if (connect_resp_info->pu8RespIEs) {
-                       kfree(connect_resp_info->pu8RespIEs);
-                       connect_resp_info->pu8RespIEs = NULL;
-               } else {
-                       result = -EFAULT;
-               }
-
-               kfree(connect_resp_info);
-               connect_resp_info = NULL;
-
-       } else {
-               result = -EFAULT;
-       }
-
-       return result;
-}

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 23775e4e0f37ff7f228d293c0bf8ad712b5b8390..d42f47c8e61da8f29e869748bbf0cfd336c58658 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -123,7 +123,6 @@ typedef struct {
 s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info);
 s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
                               tstrConnectRespInfo **ret_connect_resp_info);
-s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *connect_resp_info);
 void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,
                                 u32 u32Length);
 void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer,

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 2a1d7e9524946a7e84f2799b20463f1218b4f534..30b93d0b7d80ccf40b2f1ec27a1de9cd3c0874bd 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1501,8 +1501,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                                                }
 
                                                if (pstrConnectRespInfo) {
-                                                       wilc_dealloc_assoc_resp_info(pstrConnectRespInfo);
-                                                       pstrConnectRespInfo = NULL;
+                                                       kfree(pstrConnectRespInfo->pu8RespIEs);
+                                                       kfree(pstrConnectRespInfo);
                                                }
                                        }
                                }