Skip to contentSkip to conversation

staging: wilc1000: remove wilc_platform include file

PATCH New Chaehyun Lim 1 participant 2 messages Sep 29, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 staging: wilc1000: remove wilc_platform include file

This patch removes wilc_platform.h include file in wilc_oswrapper.h wilc_platform.h have several standard header files so that some header files should be included to avoid compilation errors.

---
 drivers/staging/wilc1000/coreconfigurator.c | 1 +
 drivers/staging/wilc1000/host_interface.c   | 4 ++++
 drivers/staging/wilc1000/wilc_oswrapper.h   | 2 --
 drivers/staging/wilc1000/wilc_wlan_if.h     | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)
drivers/staging/wilc1000/coreconfigurator.c +1 -0
index 68e3c7f..34a6c10 100644
@@ -12,6 +12,7 @@
 #include "coreconfigurator.h"
 #include "wilc_wlan_if.h"
 #include <linux/errno.h>
+#include <linux/slab.h>
 #define TAG_PARAM_OFFSET	(MAC_HDR_LEN + TIME_STAMP_LEN + \
 							BEACON_INTERVAL_LEN + CAP_INFO_LEN)
 
drivers/staging/wilc1000/host_interface.c +4 -0
index 99de804..bc990b3 100644
@@ -1,3 +1,7 @@
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <linux/kthread.h>
+#include <linux/delay.h>
 #include "host_interface.h"
 #include "coreconfigurator.h"
 #include "wilc_wlan_if.h"
drivers/staging/wilc1000/wilc_oswrapper.h +0 -2
index 5456c96..10d16e9 100644
@@ -11,8 +11,6 @@
  */
 
 
-/* Os Configuration File */
-#include "wilc_platform.h"
 
 
 #endif
drivers/staging/wilc1000/wilc_wlan_if.h +1 -0
index 2d6e0ce..e4807ae 100644
@@ -13,6 +13,7 @@
 /* #define MEMORY_STATIC */
 /* #define USE_OLD_SPI_SW */
 
+#include <linux/semaphore.h>
 #include "wilc_oswrapper.h"
 #include "linux_wlan_common.h"
 
Signature · 1 line
2.5.1
#1 lore raw

PATCH 2/2 staging: wilc1000: delete wilc_oswrapper.h

This patch deletes wilc_oswrapper.h that has nothing inside.

---
 drivers/staging/wilc1000/wilc_oswrapper.h | 16 ----------------
 drivers/staging/wilc1000/wilc_wlan.h      |  1 -
 drivers/staging/wilc1000/wilc_wlan_if.h   |  1 -
 3 files changed, 18 deletions(-)
 delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h
drivers/staging/wilc1000/wilc_oswrapper.h deleted +0 -16
deleted file mode 100644
index 10d16e9..0000000
@@ -1,16 +0,0 @@
-#ifndef __WILC_OSWRAPPER_H__
-#define __WILC_OSWRAPPER_H__
-
-/*!
- *  @file	wilc_oswrapper.h
- *  @brief	Top level OS Wrapper, include this file and it will include all
- *              other files as necessary
- *  @author	syounan
- *  @date	10 Aug 2010
- *  @version	1.0
- */
-
-
-
-
-#endif
drivers/staging/wilc1000/wilc_wlan.h +0 -1
index 60da18c..ad8de29 100644
@@ -1,7 +1,6 @@
 #ifndef WILC_WLAN_H
 #define WILC_WLAN_H
 
-#include "wilc_oswrapper.h"
 
 
 #define ISWILC1000(id)   (((id & 0xfffff000) == 0x100000) ? 1 : 0)
drivers/staging/wilc1000/wilc_wlan_if.h +0 -1
index e4807ae..c0b5df9 100644
@@ -14,7 +14,6 @@
 /* #define USE_OLD_SPI_SW */
 
 #include <linux/semaphore.h>
-#include "wilc_oswrapper.h"
 #include "linux_wlan_common.h"
 
 /********************************************
Signature · 1 line
2.5.1