summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/coreconfigurator.c
diff options
context:
space:
mode:
authorLeo Kim2015-09-16 11:36:01 +0200
committerGreg Kroah-Hartman2015-09-17 06:39:06 +0200
commit24db713fe5325917690c2c793a6321aa0b11a0c8 (patch)
tree15589dc8c1276ab22664944e143014e42185b6b5 /drivers/staging/wilc1000/coreconfigurator.c
parentstaging: wilc1000: remove the macro WILC_ERRORCHECK (diff)
downloadkernel-qcow2-linux-24db713fe5325917690c2c793a6321aa0b11a0c8.tar.gz
kernel-qcow2-linux-24db713fe5325917690c2c793a6321aa0b11a0c8.tar.xz
kernel-qcow2-linux-24db713fe5325917690c2c793a6321aa0b11a0c8.zip
staging: wilc1000: remove the macro WILC_ERRORREPORT
This patch removes the macro WILC_ERRORREPORT which is not used anymore by replacing it with the plain statements. The compiler complains the build warnings in some functions for WILC_CATCH and ERRORHANDLER as unused definitions. So, this patch also removes WILC_CATCH and ERRORHANDLER from some of functions. Signed-off-by: Leo Kim <leo.kim@atmel.com> Signed-off-by: Tony Cho <tony.cho@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/coreconfigurator.c')
-rw-r--r--drivers/staging/wilc1000/coreconfigurator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 87d32ae30bf4..96358a92aeb9 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -13,6 +13,7 @@
/* File Includes */
/*****************************************************************************/
#include "coreconfigurator.h"
+#include <linux/errno.h>
/*****************************************************************************/
/* Constants */
/*****************************************************************************/
@@ -429,7 +430,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
/* Check whether the received message type is 'N' */
if ('N' != u8MsgType) {
PRINT_ER("Received Message format incorrect.\n");
- WILC_ERRORREPORT(s32Error, WILC_FAIL);
+ return -EFAULT;
}
/* Extract message ID */
@@ -525,7 +526,6 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
*ppstrNetworkInfo = pstrNetworkInfo;
-ERRORHANDLER:
return s32Error;
}