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>

diff --git a/drivers/staging/csr/csr_formatted_io.c b/drivers/staging/csr/csr_formatted_io.c
index d26fd78c2820269e62318649cb092d21b412fa17..51fb988a587aae68fcc4d1c8a5f78dd92d4d67c3 100644 (file)
--- 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 c87f637e2092f7271c6cbbd534b4313d7449c081..2e238cb98d51094e304b411b397b4aa4d2dae8ab 100644 (file)
--- 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 6b9ac92809805293990714ce9513d80473c6563f..7a0d660007fd8f6b0264f7d469dc55ffbe20ef66 100644 (file)
--- 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 58cc22c9fcf7070583d93449aa07992ba82b2871..46689c173c6f89b613d9528e82346cdf11b3266c 100644 (file)
--- 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 b1ff72f2ccf575ea4db659835011f3c41f3fe1c1..57194ee911ead3cfc2070c90cfdad725e44c9067 100644 (file)
--- 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 841d7eceed211cf946814ad19f87ca679b9aae37..b1a57d5d06f9fc36c0aa2b562394095885d72446 100644 (file)
--- 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 2619d2229ec06f92c4e83e893985625d083607f1..b2808569f8de12d52ed088e90607636d1d8ca9ef 100644 (file)
--- 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 48e8a2257161191b582c798c70421432210ad286..8842e4bf4611ba4ea801f2375fbd926fac2c7599 100644 (file)
--- 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 9fc2aa2bb41dc9d24eff7951e3a0d1da740f2867..9fe6c90244c470a483121d5ab1df28448c23e7c7 100644 (file)
--- 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 22405cfcf1449b68615824462bdebd6eecefb487..57cbfcb0619b9760daf6e4e6f023c963a2ab82b2 100644 (file)
--- 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 ad01958f3683b8e19699c5048c2d0e5c7c4b500e..a2e08428a11971421716d4eabb40a2c72a936af7 100644 (file)
--- 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 5aefda312a49d8ed780fe4e513b913f30a4fe232..2e1aad8a38955d924bf84c458672950deb059024 100644 (file)
--- 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 0b78a725ceec2b1620ba5728839311d38e967dbe..353a829bb74c9f9b05c82a1f9733d435f4e7f7e6 100644 (file)
--- 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 e993baf5058de48845f0fbd1c2146a6aa37e44c1..37989fc15bbe884d4f0546da2eceb030fc8e0650 100644 (file)
--- 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 7962815a65c4b86ee19ce76bf6b18f208b8f9b0e..36adf22fddd98bbf90257a2dbd4f1b3bc91c984e 100644 (file)
--- 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 7d47578f18ef0ec7a98531d783d1ef3d74333918..6a7f73dbb706649134b18ffc6a0047ce22ebf0a8 100644 (file)
--- 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 68fb7599bb836c1b9cae72e9dc792cd96070aeb4..c7c36d6b59ef80cb3c49a23d040a42755cd362c2 100644 (file)
--- 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 663fe5926e74b802dd22c1ee4265b32fab74551c..e42fca9a859fada85cf6b54336909e0de499f983 100644 (file)
--- 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 861604de63331654a9a80b06c795409386d62b57..f0cda84f6a0064be9109cd7bb5701394e06a827b 100644 (file)
--- 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 169d6bcd42dbb47ca4ab6b4805b21466ac4113c9..5fb026c2710bd42c0f60883745ad7f2c6b700dfb 100644 (file)
--- 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 9e5aa9002b6640a02907dfbf36bb878591fd4e62..4d836749d6bd76e426f4dd76c26e74f6851a88d2 100644 (file)
--- 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 286b2895915d9764f44edced18bbcfe4c736f667..09eeeee42e9fb268ffad6ebdeeab7505cdb4886c 100644 (file)
--- 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 (file)
index 7018c0a..0000000
--- 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 701aae8651ec0f80e4da1aabb678b5ba449a1799..44d7fd95a6b500b6135487123c7883a916005251 100644 (file)
--- 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 c1c3b89c285edfe6d84fdad8c5367abd44dae4f1..46bd130a248a8e1717c14351d0d8bede2d87f9a3 100644 (file)
--- 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 fa2b2b437f16902b75235f65977aff7d8a8d5d2c..4a9bde09add7a4fd8d27ec23678cd7eae338ab26 100644 (file)
--- 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 222e8074605df51af1ef382ef01d29170fa17913..a124c73a5d6e66403fbe3a5669ec52d64f5b0341 100644 (file)
--- 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 df04a8bbd4f11153747a2e4102676e4666fed89b..cc41a94b8f25d0b732818cf294e4536caf3fff12 100644 (file)
--- 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 d078deefe44596c925dcb90e22b24cd3a83d0a8b..83a9c9e2297aba5b6d749f77b5ed498f5a799160 100644 (file)
--- 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 47ca24554b6cc2ad2e15566968b31c34993a38f8..57a5cafd40bd4cfc084c1749097a22b512e481a4 100644 (file)
--- 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 f3837c6794d3c5457dcf8ff50931a5e6b0618acc..c378ccadbcf1c1133a0efc11f9e1f17e5e440130 100644 (file)
--- 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 1654d2842bb01eebe8f2758b4cbcc7eff169494c..5cf5b8a5a1e12570e7c994d3a878cdb327317548 100644 (file)
--- 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 1047f16b607792a4820ff701fe8db45259c881ee..24737ae8a2de19f7dbe6cea45d8c57c1b6a63c77 100644 (file)
--- 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 29c9a7c76cc7b170260e57583a95e13ad3f00865..5f841556bbef53e1264df1b3d9e8fe6c13d1b27a 100644 (file)
--- 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 50d458e49705dd5873baa25bb8f10f38d1e71727..88f24bacb0473359777898dfc1db53c23a95878e 100644 (file)
--- 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 861e4a42ac97464863317c945fa168aee4a24c4e..eb56f620887129bbcdba3feaed570a0fc910c0c1 100644 (file)
--- 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 4508262e9433ffeb9e178eb2a51d26b9a02a9ed8..06314109098aaf0c16049513707dfa080f57d675 100644 (file)
--- 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 a74ec69a5c80f43ef61df99aad1ff8c4514a93be..b7ebfe48dc3a37fd0c250c46c8a3857d15f4e3e6 100644 (file)
--- 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 1ca0ec95917ce967a13cf510f5afede2bee76cd6..ec670469536514dd42e4bf8eedfa66727b6769ed 100644 (file)
--- 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 5f85b018348eb4f92de4d01c12c1c18808b37d7e..524da1420f17e417654aac5e8dde89d64f1b28ae 100644 (file)
--- 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 c38f78ecd860428217fa6dedf6cad5920a7210b6..4ec7b946bd1afeb854902da4c5d4dd30f6fc3eb0 100644 (file)
--- 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 4676b42771a6715acc1a3471012860e94572dd50..20dc77971f943b9668a4a056c8e1458660aef880 100644 (file)
--- 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 2acc6c1d20baf33b072d6f5599959fd3db26b791..dca36d9f3a3ba7cc5d5e2de0343fad29885c29fd 100644 (file)
--- 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 2a03a19e402f6037e8ed9d63d925ffa46f59a985..76f44dbe26a9b1b00bf8de606cff0b607f6c877c 100644 (file)
--- 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 878b23b65779eaff1e5a72902f57023ac8cf3fba..47309984e2a78bcf595cacf3f27ddbe8976961db 100644 (file)
--- 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 95b73a0d71e6ff4006eec0a864e6f0eddd94bd62..2f87cda9003e08b7267e633ff7987b22c79f30a0 100644 (file)
--- 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 d837eea4328f83b45c3cc2d8bc7a9c8eaa14df84..df9dd9bf6007510474b7988c47834875c950f15d 100644 (file)
--- 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 f5ad3b312b352aabf69426f617aaf71a178b068e..ec972ac0b5aa11f9b96ebbf5f9d4d6d73660ac29 100644 (file)
--- 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 458fb96c061e91704e6ac4107cc633532ef36ebc..f270377201890aeadcb7d91b8203b69382f289c3 100644 (file)
--- 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 ae0965b44643e44e446b3636a2e99ef49e71f6fd..2ca557c727dd17406aafc849bdcc87434059ff62 100644 (file)
--- 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 64b1f4fd7cd629999c488053418dca682cdaabf3..c61486fbb6d62bb87dd78782ae1501a76d58cd20 100644 (file)
--- 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 e6fdf322a4169441b88389d52b9280dea0f2e06a..4951c404a3e9b15e3b325c4b074ebd2efbf61b5f 100644 (file)
--- 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 5bc460e4a393db3164ddf07916511ef5ba64eaca..4e51fae4cda00f374a2d169cd553abce8bbe7141 100644 (file)
--- 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 e42b21f396a5bb408d8f2e540ad2a825db86ad08..f340780a27af4e1aa0b0aa69ed7940404636fb06 100644 (file)
--- 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 743dbdc283c08cee8c7eb019756804f64ed6be9a..e73f94b0c2a28976937eefa46d765cff5e407395 100644 (file)
--- 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 cacb3a5b8c4e36b536d366f37586769cf9a5398f..22a3419b1b1cbf0599f60f563df05be5b1e18f72 100644 (file)
--- 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 01df2a54966cb3c463a37f7a1d004474508bd70b..93b64e9154c8b628564246e33cd482921f11477c 100644 (file)
--- 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 6960f8fa886fdabf7a6e48812f4b54da9c6a6081..f320bd43e1d5d49165daf94925e6c7bed489917c 100644 (file)
--- 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 84eb6e9f0c267b7bef62c87bc474c5db37c1d946..55cac5059bf7f0efab17b6d153f0d483ca62e631 100644 (file)
--- 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 e8d50006e73ad61311b743fa98d4c79e928e64c7..9ea9d15fe0d8ca2d50f1dc5f190160577667785b 100644 (file)
--- 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 62cc8b77fe4ab1446897b6fc1f591f9bbb257c9c..0f725e454939b74116185bc841f00ec17e0231e6 100644 (file)
--- 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 9acf9ee7a8da82e7855146f3df414baeec5fa42a..b9de0cb94e9a8725549f8f24dfa0f10c1c47bcbf 100644 (file)
--- 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)