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>
2012-07-20 13:07:13 -07:00 · 2012-07-20 13:07:13 -07:00 · 980b5a2b0d
commit 980b5a2b0d
parent b6b5244e4f
62 changed files with 22 additions and 100 deletions
--- 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"

--- 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, ...);

--- 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"

--- 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"

--- 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>
--- 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
--- 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"
--- 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
--- 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
--- 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 */
 /*------------------------------------------------------------------*/
--- 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"
--- 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"
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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)
--- 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" {
--- a/drivers/staging/csr/csr_types.h
+++ b/drivers/staging/csr/csr_types.h
@ -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
--- 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
--- 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"
--- 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"

--- 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"

 /*------------------------------------------------------------------*/
--- 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
--- 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"
--- 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"

--- 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"
--- 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
--- 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" {
--- 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"


--- 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 */
--- 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"


--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"

--- 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
--- 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
--- 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
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"

--- 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
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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
--- 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)