staging: wilc1000: removes function 'wilc_dealloc_network_info()'

This patch removes function 'wilc_dealloc_network_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 11e3ce078bad604c4683624571fc2d9a1a5bcad7..81dd22e9c5f684e118b0797052aaa87ba7c32775 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -353,28 +353,6 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
        return 0;
 }
 
-s32 wilc_dealloc_network_info(tstrNetworkInfo *network_info)
-{
-       s32 result = 0;
-
-       if (network_info) {
-               if (network_info->pu8IEs) {
-                       kfree(network_info->pu8IEs);
-                       network_info->pu8IEs = NULL;
-               } else {
-                       result = -EFAULT;
-               }
-
-               kfree(network_info);
-               network_info = NULL;
-
-       } else {
-               result = -EFAULT;
-       }
-
-       return result;
-}
-
 s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
                               tstrConnectRespInfo **ret_connect_resp_info)
 {

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index d801e58be8e6b238e1a355b8af2501c74217d348..23775e4e0f37ff7f228d293c0bf8ad712b5b8390 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -121,7 +121,6 @@ typedef struct {
 } tstrDisconnectNotifInfo;
 
 s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info);
-s32 wilc_dealloc_network_info(tstrNetworkInfo *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);

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6e0a4267a8ec11ae68d5d703825cc238c2199c88..2a1d7e9524946a7e84f2799b20463f1218b4f534 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1410,8 +1410,8 @@ done:
        pstrRcvdNetworkInfo->buffer = NULL;
 
        if (pstrNetworkInfo) {
-               wilc_dealloc_network_info(pstrNetworkInfo);
-               pstrNetworkInfo = NULL;
+               kfree(pstrNetworkInfo->pu8IEs);
+               kfree(pstrNetworkInfo);
        }
 
        return result;