staging: csr: remove csr_types.h

Only thing left in here is the TRUE/FALSE #defines, so move them to
csr_macro.h and remove the file.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

62 files changed, 22 insertions, 100 deletions

diff --git a/drivers/staging/csr/csr_formatted_io.c b/drivers/staging/csr/csr_formatted_io.c
index d26fd78c282..51fb988a587 100644
--- a/drivers/staging/csr/csr_formatted_io.c
+++ b/drivers/staging/csr/csr_formatted_io.c
@@ -8,7 +8,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
 #include "csr_formatted_io.h"
 #include "csr_util.h"
 
diff --git a/drivers/staging/csr/csr_formatted_io.h b/drivers/staging/csr/csr_formatted_io.h
index c87f637e209..2e238cb98d5 100644
--- a/drivers/staging/csr/csr_formatted_io.h
+++ b/drivers/staging/csr/csr_formatted_io.h
@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-#include "csr_types.h"
+#include <linux/types.h>
 
 s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...);
 
diff --git a/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c
index 6b9ac928098..7a0d660007f 100644
--- a/drivers/staging/csr/csr_framework_ext.c
+++ b/drivers/staging/csr/csr_framework_ext.c
@@ -28,7 +28,6 @@
 
 #include <linux/bitops.h>
 
-#include "csr_types.h"
 #include "csr_framework_ext.h"
 #include "csr_panic.h"
 
diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h
index 58cc22c9fcf..46689c173c6 100644
--- a/drivers/staging/csr/csr_framework_ext.h
+++ b/drivers/staging/csr/csr_framework_ext.h
@@ -10,7 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
 #include "csr_result.h"
 #include "csr_framework_ext_types.h"
 
diff --git a/drivers/staging/csr/csr_framework_ext_types.h b/drivers/staging/csr/csr_framework_ext_types.h
index b1ff72f2ccf..57194ee911e 100644
--- a/drivers/staging/csr/csr_framework_ext_types.h
+++ b/drivers/staging/csr/csr_framework_ext_types.h
@@ -10,8 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
-
 #ifdef __KERNEL__
 #include <linux/kthread.h>
 #include <linux/semaphore.h>
diff --git a/drivers/staging/csr/csr_lib.h b/drivers/staging/csr/csr_lib.h
index 841d7eceed2..b1a57d5d06f 100644
--- a/drivers/staging/csr/csr_lib.h
+++ b/drivers/staging/csr/csr_lib.h
@@ -10,7 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
 #include "csr_prim_defs.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h
index 2619d2229ec..b2808569f8d 100644
--- a/drivers/staging/csr/csr_log.h
+++ b/drivers/staging/csr/csr_log.h
@@ -10,7 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
 #include "csr_sched.h"
 #include "csr_panic.h"
 #include "csr_prim_defs.h"
diff --git a/drivers/staging/csr/csr_log_configure.h b/drivers/staging/csr/csr_log_configure.h
index 48e8a225716..8842e4bf461 100644
--- a/drivers/staging/csr/csr_log_configure.h
+++ b/drivers/staging/csr/csr_log_configure.h
@@ -10,7 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
 #include "csr_log.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_log_text.h b/drivers/staging/csr/csr_log_text.h
index 9fc2aa2bb41..9fe6c90244c 100644
--- a/drivers/staging/csr/csr_log_text.h
+++ b/drivers/staging/csr/csr_log_text.h
@@ -10,7 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
 #include "csr_log_configure.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h
index 22405cfcf14..57cbfcb0619 100644
--- a/drivers/staging/csr/csr_macro.h
+++ b/drivers/staging/csr/csr_macro.h
@@ -10,12 +10,15 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
+#include <linux/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define FALSE	(0)
+#define TRUE	(1)
+
 /*------------------------------------------------------------------*/
 /* Bits - intended to operate on u32 values */
 /*------------------------------------------------------------------*/
diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index ad01958f368..a2e08428a11 100644
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/drivers/staging/csr/csr_msgconv.c
@@ -9,7 +9,7 @@
 *****************************************************************************/
 
 #include <linux/module.h>
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_pmem.h"
 #include "csr_panic.h"
 #include "csr_sched.h"
diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h
index 5aefda312a4..2e1aad8a389 100644
--- a/drivers/staging/csr/csr_msgconv.h
+++ b/drivers/staging/csr/csr_msgconv.h
@@ -11,7 +11,7 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_unicode.h"
diff --git a/drivers/staging/csr/csr_panic.c b/drivers/staging/csr/csr_panic.c
index 0b78a725cee..353a829bb74 100644
--- a/drivers/staging/csr/csr_panic.c
+++ b/drivers/staging/csr/csr_panic.c
@@ -12,7 +12,6 @@
 #include <linux/version.h>
 #include <linux/module.h>
 
-#include "csr_types.h"
 #include "csr_panic.h"
 
 void CsrPanic(u8 tech, u16 reason, const char *p)
diff --git a/drivers/staging/csr/csr_panic.h b/drivers/staging/csr/csr_panic.h
index e993baf5058..37989fc15bb 100644
--- a/drivers/staging/csr/csr_panic.h
+++ b/drivers/staging/csr/csr_panic.h
@@ -9,8 +9,6 @@
             on the license terms.
 
 *****************************************************************************/
-#include "csr_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h
index 7962815a65c..36adf22fddd 100644
--- a/drivers/staging/csr/csr_pmem.h
+++ b/drivers/staging/csr/csr_pmem.h
@@ -10,7 +10,7 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_util.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_prim_defs.h b/drivers/staging/csr/csr_prim_defs.h
index 7d47578f18e..6a7f73dbb70 100644
--- a/drivers/staging/csr/csr_prim_defs.h
+++ b/drivers/staging/csr/csr_prim_defs.h
@@ -9,8 +9,6 @@
             on the license terms.
 
 *****************************************************************************/
-#include "csr_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/drivers/staging/csr/csr_result.h b/drivers/staging/csr/csr_result.h
index 68fb7599bb8..c7c36d6b59e 100644
--- a/drivers/staging/csr/csr_result.h
+++ b/drivers/staging/csr/csr_result.h
@@ -10,8 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h
index 663fe5926e7..e42fca9a859 100644
--- a/drivers/staging/csr/csr_sched.h
+++ b/drivers/staging/csr/csr_sched.h
@@ -9,7 +9,7 @@
             on the license terms.
 
 *****************************************************************************/
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_time.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_sdio.h b/drivers/staging/csr/csr_sdio.h
index 861604de633..f0cda84f6a0 100644
--- a/drivers/staging/csr/csr_sdio.h
+++ b/drivers/staging/csr/csr_sdio.h
@@ -10,7 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
 #include "csr_result.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c
index 169d6bcd42d..5fb026c2710 100644
--- a/drivers/staging/csr/csr_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -9,7 +9,6 @@
 *****************************************************************************/
 
 #include <linux/module.h>
-#include "csr_types.h"
 #include "csr_prim_defs.h"
 #include "csr_msgconv.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_time.c b/drivers/staging/csr/csr_time.c
index 9e5aa9002b6..4d836749d6b 100644
--- a/drivers/staging/csr/csr_time.c
+++ b/drivers/staging/csr/csr_time.c
@@ -20,7 +20,6 @@
 #include <linux/time.h>
 #include <linux/module.h>
 
-#include "csr_types.h"
 #include "csr_time.h"
 
 CsrTime CsrTimeGet(CsrTime *high)
diff --git a/drivers/staging/csr/csr_time.h b/drivers/staging/csr/csr_time.h
index 286b2895915..09eeeee42e9 100644
--- a/drivers/staging/csr/csr_time.h
+++ b/drivers/staging/csr/csr_time.h
@@ -10,7 +10,7 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
+#include <linux/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h
deleted file mode 100644
index 7018c0a708d..00000000000
--- a/drivers/staging/csr/csr_types.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef CSR_TYPES_H__
-#define CSR_TYPES_H__
-/*****************************************************************************
-
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
-
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
-
-*****************************************************************************/
-
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <asm/byteorder.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef  FALSE
-#define FALSE (0)
-
-#undef  TRUE
-#define TRUE (1)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h
index 701aae8651e..44d7fd95a6b 100644
--- a/drivers/staging/csr/csr_unicode.h
+++ b/drivers/staging/csr/csr_unicode.h
@@ -10,8 +10,6 @@
 
 *****************************************************************************/
 
-#include "csr_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index c1c3b89c285..46bd130a248 100644
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -8,7 +8,6 @@
 
 *****************************************************************************/
 #include <linux/module.h>
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_unicode.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c
index fa2b2b437f1..4a9bde09add 100644
--- a/drivers/staging/csr/csr_util.c
+++ b/drivers/staging/csr/csr_util.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <stdarg.h>
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_util.h"
 
diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
index 222e8074605..a124c73a5d6 100644
--- a/drivers/staging/csr/csr_util.h
+++ b/drivers/staging/csr/csr_util.h
@@ -14,7 +14,8 @@
 extern "C" {
 #endif
 
-#include "csr_types.h"
+#include <linux/kernel.h>
+#include <linux/types.h>
 #include "csr_macro.h"
 
 /*------------------------------------------------------------------*/
diff --git a/drivers/staging/csr/csr_wifi_common.h b/drivers/staging/csr/csr_wifi_common.h
index df04a8bbd4f..cc41a94b8f2 100644
--- a/drivers/staging/csr/csr_wifi_common.h
+++ b/drivers/staging/csr/csr_wifi_common.h
@@ -11,7 +11,7 @@
 #ifndef CSR_WIFI_COMMON_H__
 #define CSR_WIFI_COMMON_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_result.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h
index d078deefe44..83a9c9e2297 100644
--- a/drivers/staging/csr/csr_wifi_fsm.h
+++ b/drivers/staging/csr/csr_wifi_fsm.h
@@ -15,7 +15,6 @@
 extern "C" {
 #endif
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_prim_defs.h"
 #include "csr_log_text.h"
diff --git a/drivers/staging/csr/csr_wifi_fsm_event.h b/drivers/staging/csr/csr_wifi_fsm_event.h
index 47ca24554b6..57a5cafd40b 100644
--- a/drivers/staging/csr/csr_wifi_fsm_event.h
+++ b/drivers/staging/csr/csr_wifi_fsm_event.h
@@ -15,7 +15,6 @@
 extern "C" {
 #endif
 
-#include "csr_types.h"
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 
diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h
index f3837c6794d..c378ccadbcf 100644
--- a/drivers/staging/csr/csr_wifi_fsm_types.h
+++ b/drivers/staging/csr/csr_wifi_fsm_types.h
@@ -15,7 +15,7 @@
 extern "C" {
 #endif
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_util.h"
 #include "csr_pmem.h"
 #include "csr_panic.h"
diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.c b/drivers/staging/csr/csr_wifi_hip_chiphelper.c
index 1654d2842bb..5cf5b8a5a1e 100644
--- a/drivers/staging/csr/csr_wifi_hip_chiphelper.c
+++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.c
@@ -8,7 +8,7 @@
 
 *****************************************************************************/
 
-
+#include "csr_macro.h"
 #include "csr_wifi_hip_chiphelper_private.h"
 
 #ifndef nelem
diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.h b/drivers/staging/csr/csr_wifi_hip_chiphelper.h
index 1047f16b607..24737ae8a2d 100644
--- a/drivers/staging/csr/csr_wifi_hip_chiphelper.h
+++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.h
@@ -12,7 +12,7 @@
 #define CSR_WIFI_HIP_CHIPHELPER_H__
 
 
-#include "csr_types.h"
+#include <linux/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/staging/csr/csr_wifi_hip_signals.h b/drivers/staging/csr/csr_wifi_hip_signals.h
index 29c9a7c76cc..5f841556bbe 100644
--- a/drivers/staging/csr/csr_wifi_hip_signals.h
+++ b/drivers/staging/csr/csr_wifi_hip_signals.h
@@ -24,7 +24,7 @@
 #ifndef __CSR_WIFI_HIP_SIGNALS_H__
 #define __CSR_WIFI_HIP_SIGNALS_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_wifi_hip_sigs.h"
 
 
diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h
index 50d458e4970..88f24bacb04 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifi.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifi.h
@@ -95,7 +95,6 @@ extern "C" {
 #define UNIFI_SOFT_TRAFFIC_Q_LENGTH (20 + 1)
 #define UNIFI_SOFT_COMMAND_Q_LENGTH (16 + 1)
 
-#include "csr_types.h"          /* from the synergy porting folder */
 #include "csr_framework_ext.h"  /* from the synergy porting folder */
 #include "csr_sdio.h"           /* from the synergy porting folder */
 #include "csr_pmem.h"           /* from the synergy porting folder */
diff --git a/drivers/staging/csr/csr_wifi_lib.h b/drivers/staging/csr/csr_wifi_lib.h
index 861e4a42ac9..eb56f620887 100644
--- a/drivers/staging/csr/csr_wifi_lib.h
+++ b/drivers/staging/csr/csr_wifi_lib.h
@@ -10,7 +10,6 @@
 #ifndef CSR_WIFI_LIB_H__
 #define CSR_WIFI_LIB_H__
 
-#include "csr_types.h"
 #include "csr_wifi_fsm_event.h"
 
 
diff --git a/drivers/staging/csr/csr_wifi_msgconv.h b/drivers/staging/csr/csr_wifi_msgconv.h
index 4508262e943..06314109098 100644
--- a/drivers/staging/csr/csr_wifi_msgconv.h
+++ b/drivers/staging/csr/csr_wifi_msgconv.h
@@ -11,7 +11,6 @@
 #ifndef CSR_WIFI_MSGCONV_H__
 #define CSR_WIFI_MSGCONV_H__
 
-#include "csr_types.h"
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_unicode.h"
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
index a74ec69a5c8..b7ebfe48dc3 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_AP_LIB_H__
 #define CSR_WIFI_NME_AP_LIB_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
index 1ca0ec95917..ec670469536 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_AP_PRIM_H__
 #define CSR_WIFI_NME_AP_PRIM_H__
 
-#include "csr_types.h"
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
index 5f85b018348..524da1420f1 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_AP_SERIALIZE_H__
 #define CSR_WIFI_NME_AP_SERIALIZE_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
 
diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h
index c38f78ecd86..4ec7b946bd1 100644
--- a/drivers/staging/csr/csr_wifi_nme_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_LIB_H__
 #define CSR_WIFI_NME_LIB_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h
index 4676b42771a..20dc77971f9 100644
--- a/drivers/staging/csr/csr_wifi_nme_prim.h
+++ b/drivers/staging/csr/csr_wifi_nme_prim.h
@@ -13,7 +13,7 @@
 #ifndef CSR_WIFI_NME_PRIM_H__
 #define CSR_WIFI_NME_PRIM_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"
diff --git a/drivers/staging/csr/csr_wifi_nme_serialize.h b/drivers/staging/csr/csr_wifi_nme_serialize.h
index 2acc6c1d20b..dca36d9f3a3 100644
--- a/drivers/staging/csr/csr_wifi_nme_serialize.h
+++ b/drivers/staging/csr/csr_wifi_nme_serialize.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_NME_SERIALIZE_H__
 #define CSR_WIFI_NME_SERIALIZE_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
 
diff --git a/drivers/staging/csr/csr_wifi_nme_task.h b/drivers/staging/csr/csr_wifi_nme_task.h
index 2a03a19e402..76f44dbe26a 100644
--- a/drivers/staging/csr/csr_wifi_nme_task.h
+++ b/drivers/staging/csr/csr_wifi_nme_task.h
@@ -13,7 +13,7 @@
 #ifndef CSR_WIFI_NME_TASK_H__
 #define CSR_WIFI_NME_TASK_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_sched.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_wifi_private_common.h b/drivers/staging/csr/csr_wifi_private_common.h
index 878b23b6577..47309984e2a 100644
--- a/drivers/staging/csr/csr_wifi_private_common.h
+++ b/drivers/staging/csr/csr_wifi_private_common.h
@@ -11,8 +11,6 @@
 #ifndef CSR_WIFI_PRIVATE_COMMON_H__
 #define CSR_WIFI_PRIVATE_COMMON_H__
 
-#include "csr_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/drivers/staging/csr/csr_wifi_result.h b/drivers/staging/csr/csr_wifi_result.h
index 95b73a0d71e..2f87cda9003 100644
--- a/drivers/staging/csr/csr_wifi_result.h
+++ b/drivers/staging/csr/csr_wifi_result.h
@@ -11,7 +11,6 @@
 #ifndef CSR_WIFI_RESULT_H__
 #define CSR_WIFI_RESULT_H__
 
-#include "csr_types.h"
 #include "csr_result.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
index d837eea4328..df9dd9bf600 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_CTRL_LIB_H__
 #define CSR_WIFI_ROUTER_CTRL_LIB_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h
index f5ad3b312b3..ec972ac0b5a 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h
@@ -13,7 +13,7 @@
 #ifndef CSR_WIFI_ROUTER_CTRL_PRIM_H__
 #define CSR_WIFI_ROUTER_CTRL_PRIM_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
index 458fb96c061..f2703772018 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__
 #define CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
 
diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h
index ae0965b4464..2ca557c727d 100644
--- a/drivers/staging/csr/csr_wifi_router_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_LIB_H__
 #define CSR_WIFI_ROUTER_LIB_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_wifi_router_prim.h b/drivers/staging/csr/csr_wifi_router_prim.h
index 64b1f4fd7cd..c61486fbb6d 100644
--- a/drivers/staging/csr/csr_wifi_router_prim.h
+++ b/drivers/staging/csr/csr_wifi_router_prim.h
@@ -13,7 +13,7 @@
 #ifndef CSR_WIFI_ROUTER_PRIM_H__
 #define CSR_WIFI_ROUTER_PRIM_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"
diff --git a/drivers/staging/csr/csr_wifi_router_serialize.h b/drivers/staging/csr/csr_wifi_router_serialize.h
index e6fdf322a41..4951c404a3e 100644
--- a/drivers/staging/csr/csr_wifi_router_serialize.h
+++ b/drivers/staging/csr/csr_wifi_router_serialize.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_SERIALIZE_H__
 #define CSR_WIFI_ROUTER_SERIALIZE_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
 
diff --git a/drivers/staging/csr/csr_wifi_router_task.h b/drivers/staging/csr/csr_wifi_router_task.h
index 5bc460e4a39..4e51fae4cda 100644
--- a/drivers/staging/csr/csr_wifi_router_task.h
+++ b/drivers/staging/csr/csr_wifi_router_task.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_TASK_H__
 #define CSR_WIFI_ROUTER_TASK_H__
 
-#include "csr_types.h"
 #include "csr_sched.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_wifi_router_transport.c b/drivers/staging/csr/csr_wifi_router_transport.c
index e42b21f396a..f340780a27a 100644
--- a/drivers/staging/csr/csr_wifi_router_transport.c
+++ b/drivers/staging/csr/csr_wifi_router_transport.c
@@ -10,7 +10,6 @@
 
 #include "unifi_priv.h"
 
-#include "csr_types.h"
 #include "csr_sched.h"
 #include "csr_msgconv.h"
 
diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
index 743dbdc283c..e73f94b0c2a 100644
--- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
@@ -9,7 +9,6 @@
 *****************************************************************************/
 
 #include <linux/module.h>
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_util.h"
 #include "csr_msgconv.h"
diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
index cacb3a5b8c4..22a3419b1b1 100644
--- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_SME_AP_LIB_H__
 #define CSR_WIFI_SME_AP_LIB_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_wifi_sme_ap_prim.h b/drivers/staging/csr/csr_wifi_sme_ap_prim.h
index 01df2a54966..93b64e9154c 100644
--- a/drivers/staging/csr/csr_wifi_sme_ap_prim.h
+++ b/drivers/staging/csr/csr_wifi_sme_ap_prim.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_SME_AP_PRIM_H__
 #define CSR_WIFI_SME_AP_PRIM_H__
 
-#include "csr_types.h"
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"
diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h
index 6960f8fa886..f320bd43e1d 100644
--- a/drivers/staging/csr/csr_wifi_sme_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_lib.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_SME_LIB_H__
 #define CSR_WIFI_SME_LIB_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_sched.h"
 #include "csr_util.h"
diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h
index 84eb6e9f0c2..55cac5059bf 100644
--- a/drivers/staging/csr/csr_wifi_sme_prim.h
+++ b/drivers/staging/csr/csr_wifi_sme_prim.h
@@ -13,7 +13,7 @@
 #ifndef CSR_WIFI_SME_PRIM_H__
 #define CSR_WIFI_SME_PRIM_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 #include "csr_wifi_common.h"
diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.h b/drivers/staging/csr/csr_wifi_sme_serialize.h
index e8d50006e73..9ea9d15fe0d 100644
--- a/drivers/staging/csr/csr_wifi_sme_serialize.h
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_SME_SERIALIZE_H__
 #define CSR_WIFI_SME_SERIALIZE_H__
 
-#include "csr_types.h"
 #include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
 
diff --git a/drivers/staging/csr/csr_wifi_sme_task.h b/drivers/staging/csr/csr_wifi_sme_task.h
index 62cc8b77fe4..0f725e45493 100644
--- a/drivers/staging/csr/csr_wifi_sme_task.h
+++ b/drivers/staging/csr/csr_wifi_sme_task.h
@@ -13,7 +13,6 @@
 #ifndef CSR_WIFI_SME_TASK_H__
 #define CSR_WIFI_SME_TASK_H__
 
-#include "csr_types.h"
 #include "csr_sched.h"
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/unifiio.h b/drivers/staging/csr/unifiio.h
index 9acf9ee7a8d..b9de0cb94e9 100644
--- a/drivers/staging/csr/unifiio.h
+++ b/drivers/staging/csr/unifiio.h
@@ -19,7 +19,6 @@
 #define __UNIFIIO_H__
 
 #include <linux/types.h>
-#include "csr_types.h"
 
 #define UNIFI_GET_UDI_ENABLE    _IOR('u',  1, int)
 #define UNIFI_SET_UDI_ENABLE    _IOW('u',  2, int)