staging: csr: remove csr_util.h

Now that the header file has nothing in it, remove it from the tree, and
adjust the places that were including it.

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>

19 files changed, 18 insertions, 36 deletions

diff --git a/drivers/staging/csr/csr_formatted_io.c b/drivers/staging/csr/csr_formatted_io.c
index bda8712f11f..7213cc8fb57 100644
--- a/drivers/staging/csr/csr_formatted_io.c
+++ b/drivers/staging/csr/csr_formatted_io.c
@@ -7,9 +7,8 @@
             on the license terms.
 
 *****************************************************************************/
-
+#include <linux/kernel.h>
 #include "csr_formatted_io.h"
-#include "csr_util.h"
 
 s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...)
 {
diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index a2e08428a11..04ce4ae49cc 100644
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/drivers/staging/csr/csr_msgconv.c
@@ -14,7 +14,7 @@
 #include "csr_panic.h"
 #include "csr_sched.h"
 #include "csr_msgconv.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 
 static CsrMsgConvEntry *converter;
 
diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h
index 36adf22fddd..5e8b6a08c63 100644
--- a/drivers/staging/csr/csr_pmem.h
+++ b/drivers/staging/csr/csr_pmem.h
@@ -11,7 +11,7 @@
 *****************************************************************************/
 
 #include <linux/types.h>
-#include "csr_util.h"
+#include "csr_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c
index dfb89f1f9fa..a4b56323a04 100644
--- a/drivers/staging/csr/csr_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include "csr_prim_defs.h"
 #include "csr_msgconv.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_pmem.h"
 #include "csr_lib.h"
 
diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index 682efa90994..be48097cd0d 100644
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -10,7 +10,7 @@
 #include <linux/module.h>
 #include "csr_pmem.h"
 #include "csr_unicode.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 
 #define UNI_SUR_HIGH_START   ((u32) 0xD800)
 #define UNI_SUR_HIGH_END     ((u32) 0xDBFF)
diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
deleted file mode 100644
index 17e241dd157..00000000000
--- a/drivers/staging/csr/csr_util.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef CSR_UTIL_H__
-#define CSR_UTIL_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/kernel.h>
-#include <linux/types.h>
-#include "csr_macro.h"
-
-#endif
diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h
index c378ccadbcf..3251fa900d1 100644
--- a/drivers/staging/csr/csr_wifi_fsm_types.h
+++ b/drivers/staging/csr/csr_wifi_fsm_types.h
@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 #include <linux/types.h>
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_pmem.h"
 #include "csr_panic.h"
 #include "csr_sched.h"
diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h
index 88f24bacb04..cabcf56b1fb 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifi.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifi.h
@@ -98,7 +98,7 @@ extern "C" {
 #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 */
-#include "csr_util.h"           /* from the synergy porting folder */
+#include "csr_macro.h"          /* from the synergy porting folder */
 #include "csr_formatted_io.h"   /* from the synergy gsp folder */
 #include "csr_wifi_result.h"
 
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
index fed0e651739..ce2c7d51b04 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
@@ -12,7 +12,7 @@
 
 #include "csr_msgconv.h"
 #include "csr_pmem.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 
 #ifdef CSR_WIFI_NME_ENABLE
 #ifdef CSR_WIFI_AP_ENABLE
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
index a07511e52c3..45b8d267dd0 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
@@ -15,7 +15,7 @@
 
 #include "csr_pmem.h"
 #include "csr_sched.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_msg_transport.h"
 
 #include "csr_wifi_lib.h"
diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h
index 32ae9bfa9fd..4d8f3f14ce6 100644
--- a/drivers/staging/csr/csr_wifi_nme_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_lib.h
@@ -15,7 +15,7 @@
 
 #include "csr_pmem.h"
 #include "csr_sched.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_msg_transport.h"
 
 #include "csr_wifi_lib.h"
diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.c b/drivers/staging/csr/csr_wifi_router_converter_init.c
index c90d2086893..a3217865954 100644
--- a/drivers/staging/csr/csr_wifi_router_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_router_converter_init.c
@@ -12,7 +12,7 @@
 
 #include "csr_msgconv.h"
 #include "csr_pmem.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 
 
 #ifdef CSR_LOG_ENABLE
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
index 4dd8e6f25bd..503f1afcb63 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
@@ -12,8 +12,7 @@
 
 #include "csr_msgconv.h"
 #include "csr_pmem.h"
-#include "csr_util.h"
-
+#include "csr_macro.h"
 
 #ifdef CSR_LOG_ENABLE
 #include "csr_log.h"
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
index 97d675a7a6c..fd214672f19 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
@@ -15,7 +15,7 @@
 
 #include "csr_pmem.h"
 #include "csr_sched.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_msg_transport.h"
 
 #include "csr_wifi_lib.h"
diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h
index 2ca557c727d..e5f1f638d86 100644
--- a/drivers/staging/csr/csr_wifi_router_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_lib.h
@@ -15,7 +15,7 @@
 
 #include "csr_pmem.h"
 #include "csr_sched.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_msg_transport.h"
 
 #include "csr_wifi_lib.h"
diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
index e73f94b0c2a..661d3201613 100644
--- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
@@ -10,7 +10,7 @@
 
 #include <linux/module.h>
 #include "csr_pmem.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_msgconv.h"
 #include "csr_wifi_msgconv.h"
 #include "csr_wifi_lib.h"
diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
index 06a6f32845f..8834a3b8a6c 100644
--- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
@@ -15,7 +15,7 @@
 
 #include "csr_pmem.h"
 #include "csr_sched.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_msg_transport.h"
 
 #include "csr_wifi_lib.h"
diff --git a/drivers/staging/csr/csr_wifi_sme_converter_init.c b/drivers/staging/csr/csr_wifi_sme_converter_init.c
index 62b94e7e01f..2d9c683e7cd 100644
--- a/drivers/staging/csr/csr_wifi_sme_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_sme_converter_init.c
@@ -12,7 +12,7 @@
 
 #include "csr_msgconv.h"
 #include "csr_pmem.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 
 
 #ifdef CSR_LOG_ENABLE
diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h
index 5b1b8638d8c..7fa9c2353c7 100644
--- a/drivers/staging/csr/csr_wifi_sme_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_lib.h
@@ -15,7 +15,7 @@
 
 #include "csr_pmem.h"
 #include "csr_sched.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 #include "csr_msg_transport.h"
 
 #include "csr_wifi_lib.h"