summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Kim <leo.kim@atmel.com>2015-09-16 18:36:04 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-09-16 21:40:13 -0700
commit6569738ad547c6562c94254245a12aaaf2e375c4 (patch)
treed566cd39935457b219ea0ecf2a42c4b63f84e411
parente6e12661d8e123667afc03a58fc2e90cd95c5e5e (diff)
downloadlinux-stable-6569738ad547c6562c94254245a12aaaf2e375c4.tar.gz
linux-stable-6569738ad547c6562c94254245a12aaaf2e375c4.tar.bz2
linux-stable-6569738ad547c6562c94254245a12aaaf2e375c4.zip
staging: wilc1000: remove wilc_errorsupport.h
This patch removes the wilc_errorsupport.h which is not used anymore and also deletes #include "wilc_errorsupport.h" from the source code. In addition, adds linux_wlan_common.h file in the wilc_msgqueue.c file in order to use PRINT macros defined in the linux_wlan_common.h file. 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>
-rw-r--r--drivers/staging/wilc1000/wilc_errorsupport.h15
-rw-r--r--drivers/staging/wilc1000/wilc_msgqueue.c1
-rw-r--r--drivers/staging/wilc1000/wilc_msgqueue.h1
-rw-r--r--drivers/staging/wilc1000/wilc_oswrapper.h3
4 files changed, 1 insertions, 19 deletions
diff --git a/drivers/staging/wilc1000/wilc_errorsupport.h b/drivers/staging/wilc1000/wilc_errorsupport.h
deleted file mode 100644
index b0babbdfb1f7..000000000000
--- a/drivers/staging/wilc1000/wilc_errorsupport.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __WILC_ERRORSUPPORT_H__
-#define __WILC_ERRORSUPPORT_H__
-
-/*!
- * @file wilc_errorsupport.h
- * @brief Error reporting and handling support
- * @author syounan
- * @sa wilc_oswrapper.h top level OS wrapper file
- * @date 10 Aug 2010
- * @version 1.0
- */
-
-#include "linux_wlan_common.h"
-
-#endif
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c
index 94a2d3d7c9e4..225bb99986a5 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.c
+++ b/drivers/staging/wilc1000/wilc_msgqueue.c
@@ -1,6 +1,7 @@
#include "wilc_msgqueue.h"
#include <linux/spinlock.h>
+#include "linux_wlan_common.h"
#include <linux/errno.h>
/*!
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h
index fb26463a001c..a3c0bba2cc88 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.h
+++ b/drivers/staging/wilc1000/wilc_msgqueue.h
@@ -11,7 +11,6 @@
*/
#include "wilc_platform.h"
-#include "wilc_errorsupport.h"
/*!
* @brief Creates a new Message queue
diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h
index 68f6efebc00c..9b5c23a458ad 100644
--- a/drivers/staging/wilc1000/wilc_oswrapper.h
+++ b/drivers/staging/wilc1000/wilc_oswrapper.h
@@ -16,9 +16,6 @@
/* Os Configuration File */
#include "wilc_platform.h"
-/* Error reporting and handling support */
-#include "wilc_errorsupport.h"
-
/* Message Queue */
#include "wilc_msgqueue.h"