From: Leo Kim <leo.kim@xxxxxxxxx>
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@xxxxxxxxx>
---
drivers/staging/wilc1000/coreconfigurator.c | 22 ----------------------
drivers/staging/wilc1000/coreconfigurator.h | 1 -
drivers/staging/wilc1000/host_interface.c | 4 ++--
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 11e3ce0..81dd22e 100644
--- 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 d801e58..23775e4 100644
--- 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 6e0a426..2a1d7e9 100644
--- 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;
--
1.9.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
