aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/csr/csr_formatted_io.c3
-rw-r--r--drivers/staging/csr/csr_msgconv.c2
-rw-r--r--drivers/staging/csr/csr_pmem.h2
-rw-r--r--drivers/staging/csr/csr_serialize_primitive_types.c2
-rw-r--r--drivers/staging/csr/csr_utf16.c2
-rw-r--r--drivers/staging/csr/csr_util.h16
-rw-r--r--drivers/staging/csr/csr_wifi_fsm_types.h2
-rw-r--r--drivers/staging/csr/csr_wifi_hip_unifi.h2
-rw-r--r--drivers/staging/csr/csr_wifi_nme_ap_converter_init.c2
-rw-r--r--drivers/staging/csr/csr_wifi_nme_ap_lib.h2
-rw-r--r--drivers/staging/csr/csr_wifi_nme_lib.h2
-rw-r--r--drivers/staging/csr/csr_wifi_router_converter_init.c2
-rw-r--r--drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c3
-rw-r--r--drivers/staging/csr/csr_wifi_router_ctrl_lib.h2
-rw-r--r--drivers/staging/csr/csr_wifi_router_lib.h2
-rw-r--r--drivers/staging/csr/csr_wifi_serialize_primitive_types.c2
-rw-r--r--drivers/staging/csr/csr_wifi_sme_ap_lib.h2
-rw-r--r--drivers/staging/csr/csr_wifi_sme_converter_init.c2
-rw-r--r--drivers/staging/csr/csr_wifi_sme_lib.h2
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 @@
7 on the license terms. 7 on the license terms.
8 8
9*****************************************************************************/ 9*****************************************************************************/
10 10#include <linux/kernel.h>
11#include "csr_formatted_io.h" 11#include "csr_formatted_io.h"
12#include "csr_util.h"
13 12
14s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...) 13s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...)
15{ 14{
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 @@
14#include "csr_panic.h" 14#include "csr_panic.h"
15#include "csr_sched.h" 15#include "csr_sched.h"
16#include "csr_msgconv.h" 16#include "csr_msgconv.h"
17#include "csr_util.h" 17#include "csr_macro.h"
18 18
19static CsrMsgConvEntry *converter; 19static CsrMsgConvEntry *converter;
20 20
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 @@
11*****************************************************************************/ 11*****************************************************************************/
12 12
13#include <linux/types.h> 13#include <linux/types.h>
14#include "csr_util.h" 14#include "csr_macro.h"
15 15
16#ifdef __cplusplus 16#ifdef __cplusplus
17extern "C" { 17extern "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 @@
11#include <linux/module.h> 11#include <linux/module.h>
12#include "csr_prim_defs.h" 12#include "csr_prim_defs.h"
13#include "csr_msgconv.h" 13#include "csr_msgconv.h"
14#include "csr_util.h" 14#include "csr_macro.h"
15#include "csr_pmem.h" 15#include "csr_pmem.h"
16#include "csr_lib.h" 16#include "csr_lib.h"
17 17
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 @@
10#include <linux/module.h> 10#include <linux/module.h>
11#include "csr_pmem.h" 11#include "csr_pmem.h"
12#include "csr_unicode.h" 12#include "csr_unicode.h"
13#include "csr_util.h" 13#include "csr_macro.h"
14 14
15#define UNI_SUR_HIGH_START ((u32) 0xD800) 15#define UNI_SUR_HIGH_START ((u32) 0xD800)
16#define UNI_SUR_HIGH_END ((u32) 0xDBFF) 16#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 @@
1#ifndef CSR_UTIL_H__
2#define CSR_UTIL_H__
3/*****************************************************************************
4
5 (c) Cambridge Silicon Radio Limited 2010
6 All rights reserved and confidential information of CSR
7
8 Refer to LICENSE.txt included with this source for details
9 on the license terms.
10
11*****************************************************************************/
12#include <linux/kernel.h>
13#include <linux/types.h>
14#include "csr_macro.h"
15
16#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" {
16#endif 16#endif
17 17
18#include <linux/types.h> 18#include <linux/types.h>
19#include "csr_util.h" 19#include "csr_macro.h"
20#include "csr_pmem.h" 20#include "csr_pmem.h"
21#include "csr_panic.h" 21#include "csr_panic.h"
22#include "csr_sched.h" 22#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" {
98#include "csr_framework_ext.h" /* from the synergy porting folder */ 98#include "csr_framework_ext.h" /* from the synergy porting folder */
99#include "csr_sdio.h" /* from the synergy porting folder */ 99#include "csr_sdio.h" /* from the synergy porting folder */
100#include "csr_pmem.h" /* from the synergy porting folder */ 100#include "csr_pmem.h" /* from the synergy porting folder */
101#include "csr_util.h" /* from the synergy porting folder */ 101#include "csr_macro.h" /* from the synergy porting folder */
102#include "csr_formatted_io.h" /* from the synergy gsp folder */ 102#include "csr_formatted_io.h" /* from the synergy gsp folder */
103#include "csr_wifi_result.h" 103#include "csr_wifi_result.h"
104 104
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 @@
12 12
13#include "csr_msgconv.h" 13#include "csr_msgconv.h"
14#include "csr_pmem.h" 14#include "csr_pmem.h"
15#include "csr_util.h" 15#include "csr_macro.h"
16 16
17#ifdef CSR_WIFI_NME_ENABLE 17#ifdef CSR_WIFI_NME_ENABLE
18#ifdef CSR_WIFI_AP_ENABLE 18#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 @@
15 15
16#include "csr_pmem.h" 16#include "csr_pmem.h"
17#include "csr_sched.h" 17#include "csr_sched.h"
18#include "csr_util.h" 18#include "csr_macro.h"
19#include "csr_msg_transport.h" 19#include "csr_msg_transport.h"
20 20
21#include "csr_wifi_lib.h" 21#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 @@
15 15
16#include "csr_pmem.h" 16#include "csr_pmem.h"
17#include "csr_sched.h" 17#include "csr_sched.h"
18#include "csr_util.h" 18#include "csr_macro.h"
19#include "csr_msg_transport.h" 19#include "csr_msg_transport.h"
20 20
21#include "csr_wifi_lib.h" 21#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 @@
12 12
13#include "csr_msgconv.h" 13#include "csr_msgconv.h"
14#include "csr_pmem.h" 14#include "csr_pmem.h"
15#include "csr_util.h" 15#include "csr_macro.h"
16 16
17 17
18#ifdef CSR_LOG_ENABLE 18#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 @@
12 12
13#include "csr_msgconv.h" 13#include "csr_msgconv.h"
14#include "csr_pmem.h" 14#include "csr_pmem.h"
15#include "csr_util.h" 15#include "csr_macro.h"
16
17 16
18#ifdef CSR_LOG_ENABLE 17#ifdef CSR_LOG_ENABLE
19#include "csr_log.h" 18#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 @@
15 15
16#include "csr_pmem.h" 16#include "csr_pmem.h"
17#include "csr_sched.h" 17#include "csr_sched.h"
18#include "csr_util.h" 18#include "csr_macro.h"
19#include "csr_msg_transport.h" 19#include "csr_msg_transport.h"
20 20
21#include "csr_wifi_lib.h" 21#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 @@
15 15
16#include "csr_pmem.h" 16#include "csr_pmem.h"
17#include "csr_sched.h" 17#include "csr_sched.h"
18#include "csr_util.h" 18#include "csr_macro.h"
19#include "csr_msg_transport.h" 19#include "csr_msg_transport.h"
20 20
21#include "csr_wifi_lib.h" 21#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 @@
10 10
11#include <linux/module.h> 11#include <linux/module.h>
12#include "csr_pmem.h" 12#include "csr_pmem.h"
13#include "csr_util.h" 13#include "csr_macro.h"
14#include "csr_msgconv.h" 14#include "csr_msgconv.h"
15#include "csr_wifi_msgconv.h" 15#include "csr_wifi_msgconv.h"
16#include "csr_wifi_lib.h" 16#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 @@
15 15
16#include "csr_pmem.h" 16#include "csr_pmem.h"
17#include "csr_sched.h" 17#include "csr_sched.h"
18#include "csr_util.h" 18#include "csr_macro.h"
19#include "csr_msg_transport.h" 19#include "csr_msg_transport.h"
20 20
21#include "csr_wifi_lib.h" 21#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 @@
12 12
13#include "csr_msgconv.h" 13#include "csr_msgconv.h"
14#include "csr_pmem.h" 14#include "csr_pmem.h"
15#include "csr_util.h" 15#include "csr_macro.h"
16 16
17 17
18#ifdef CSR_LOG_ENABLE 18#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 @@
15 15
16#include "csr_pmem.h" 16#include "csr_pmem.h"
17#include "csr_sched.h" 17#include "csr_sched.h"
18#include "csr_util.h" 18#include "csr_macro.h"
19#include "csr_msg_transport.h" 19#include "csr_msg_transport.h"
20 20
21#include "csr_wifi_lib.h" 21#include "csr_wifi_lib.h"
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-23 03:36:00 -0400