aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Kim <leo.kim@atmel.com>2016-02-04 18:15:44 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 17:34:58 -0800
commit66d77cb5bbfc3b99ea5c4ac1978b577c322cbbae (patch)
tree53d471aedd015da046cd32afc84948ddca38ad9d
parentstaging: wilc1000: wilc_parse_network_info(): renames local inner variables (diff)
staging: wilc1000: rename variable s32Error
This patch renames variable s32Error to result to avoid CamelCase naming convention. Also, remove the unused variable s32Error and replace with direct return. Signed-off-by: Leo Kim <leo.kim@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/coreconfigurator.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 2a4e324397fb..88e5661d31ba 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -356,30 +356,29 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tstrNetworkInfo **ret_network_info)
s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)
{
- s32 s32Error = 0;
+ s32 result = 0;
if (pstrNetworkInfo) {
if (pstrNetworkInfo->pu8IEs) {
kfree(pstrNetworkInfo->pu8IEs);
pstrNetworkInfo->pu8IEs = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
kfree(pstrNetworkInfo);
pstrNetworkInfo = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
- return s32Error;
+ return result;
}
s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
tstrConnectRespInfo **ppstrConnectRespInfo)
{
- s32 s32Error = 0;
tstrConnectRespInfo *pstrConnectRespInfo = NULL;
u16 u16AssocRespLen = 0;
u8 *pu8IEs = NULL;
@@ -408,27 +407,27 @@ s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,
*ppstrConnectRespInfo = pstrConnectRespInfo;
- return s32Error;
+ return 0;
}
s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo)
{
- s32 s32Error = 0;
+ s32 result = 0;
if (pstrConnectRespInfo) {
if (pstrConnectRespInfo->pu8RespIEs) {
kfree(pstrConnectRespInfo->pu8RespIEs);
pstrConnectRespInfo->pu8RespIEs = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
kfree(pstrConnectRespInfo);
pstrConnectRespInfo = NULL;
} else {
- s32Error = -EFAULT;
+ result = -EFAULT;
}
- return s32Error;
+ return result;
}