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>

diff --git a/drivers/staging/wilc1000/wilc_errorsupport.h b/drivers/staging/wilc1000/wilc_errorsupport.h
deleted file mode 100644 (file)
index b0babbd..0000000
--- 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 94a2d3d7c9e47afdbbf7578fd3d2e9c353a5dac7..225bb99986a5c092de8b6c083bb0704971ac5e18 100644 (file)
--- 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 fb26463a001ccdfd960172149b8b4de125176569..a3c0bba2cc88666c48392d413c0db75e710f1f0e 100644 (file)
--- 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 68f6efebc00c075419dbae8b935d2bc1f646a5c3..9b5c23a458ad40469b9114da4a26edc23bd47478 100644 (file)
--- 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"