staging: csr: remove csr_pmem.h

It's no longer needed.

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_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index dbf0d64a206ad62f9302ac1f343b1ec76950acef..69ae790945bd47a02216c90bafb5376b16d7a182 100644 (file)
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/drivers/staging/csr/csr_msgconv.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_panic.h"
 #include "csr_sched.h"
 #include "csr_msgconv.h"

diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h
deleted file mode 100644 (file)
index 1fb74fa..0000000
--- a/drivers/staging/csr/csr_pmem.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef CSR_PMEM_H__
-#define CSR_PMEM_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/types.h>
-#include "csr_macro.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*****************************************************************************
-
-    NAME
-        CsrPmemZalloc
-
-    DESCRIPTION
-        This function is equivalent to CsrPmemAlloc, but the allocated memory
-        is initialised to zero.
-
-    PARAMETERS
-        size - Size of memory requested. Note that a size of 0 is valid.
-
-    RETURNS
-        Pointer to allocated memory.
-
-*****************************************************************************/
-#define CsrPmemZalloc(s) (CsrMemSet(CsrPmemAlloc(s), 0x00, (s)))
-
-
-/*****************************************************************************
-
-    NAME
-        pnew and zpnew
-
-    DESCRIPTIOM
-        Type-safe wrappers for CsrPmemAlloc and CsrPmemZalloc, for allocating
-        single instances of a specified and named type.
-
-    PARAMETERS
-        t - type to allocate.
-
-*****************************************************************************/
-#define pnew(t) ((t *) (CsrPmemAlloc(sizeof(t))))
-#define zpnew(t) ((t *) (CsrPmemZalloc(sizeof(t))))
-
-
-/*----------------------------------------------------------------------------*
- * Csr Pmem Debug code. Allows custom callbacks on CsrPmemAlloc and CsrPmemFree
- *----------------------------------------------------------------------------*/
-#ifdef CSR_PMEM_DEBUG_ENABLE
-
-typedef u8 CsrPmemDebugAllocType;
-#define CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC    1
-#define CSR_PMEM_DEBUG_TYPE_MEM_ALLOC     2
-#define CSR_PMEM_DEBUG_TYPE_MEM_CALLOC    3
-#define CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA 4
-
-typedef void (CsrPmemDebugOnAlloc)(void *ptr, void *userptr, size_t size, CsrPmemDebugAllocType type, const char* file, u32 line);
-typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocType type, const char* file, u32 line);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrPmemInstallHooks
- *
- *  DESCRIPTION
- *      Install debug hooks for memory allocation
- *      Use NULL values to uninstall the hooks
- *      headSize = The number of extra bytes to allocate in the head of the Allocated buffer
- *      footSize = The number of extra bytes to allocate in the end of the Allocated buffer
- *
- *  RETURNS
- *      void
- *
- *----------------------------------------------------------------------------*/
-void CsrPmemDebugInstallHooks(u8 headSize, u8 endSize, CsrPmemDebugOnAlloc *onAllocCallback, CsrPmemDebugOnFree *onFreeCallback);
-
-void *CsrPmemDebugAlloc(size_t size, CsrPmemDebugAllocType type, const char* file, u32 line);
-
-void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line);
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c
index bb08f1952bf0de091e2a4857e3926adb9cf7dfc3..39406fd1f1a1b776aaa3cde79359b0517642c9dc 100644 (file)
--- a/drivers/staging/csr/csr_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -13,7 +13,6 @@
 #include "csr_prim_defs.h"
 #include "csr_msgconv.h"
 #include "csr_macro.h"
-#include "csr_pmem.h"
 #include "csr_lib.h"
 
 void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset)

diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index 801d8a8c095f2cfac0142e6700f6f9800511a69d..4854f85aa92ae1be53dbf1e334728a0172ee5c22 100644 (file)
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -9,7 +9,6 @@
 *****************************************************************************/
 #include <linux/module.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_unicode.h"
 #include "csr_macro.h"
 

diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h
index e933ab1be43f07f0fb4eebab0b7f47057f99a79a..073e2f8b55322303ded0a221c6775109d86737e1 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_pmem.h"
 #include "csr_prim_defs.h"
 #include "csr_log_text.h"
 #include "csr_wifi_fsm_event.h"

diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h
index 3251fa900d1dadb72e8041852fa8dace642b7c2c..26752bf316e01ae6e3a5dd788d18655b255c62ab 100644 (file)
--- a/drivers/staging/csr/csr_wifi_fsm_types.h
+++ b/drivers/staging/csr/csr_wifi_fsm_types.h
@@ -17,7 +17,6 @@ extern "C" {
 
 #include <linux/types.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 cabcf56b1fb81f3b764946797f8713a6f22703f2..dc3c60b49702de9bcd239c1f7795e4bbc8212193 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_unifi.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifi.h
@@ -97,7 +97,6 @@ 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_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 ce2c7d51b04a37848d798b66a0c9c2e04179466c..0689d6f1cab1e024a0ca4654c109e0e8b44e097c 100644 (file)
--- a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 #ifdef CSR_WIFI_NME_ENABLE

diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
index bfc511ed49d1bc807b0e36051eaac6e7af5813f7..ab9358873ec320c63974a57ac5da0bf356b18ad5 100644 (file)
--- a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_nme_ap_prim.h"
 #include "csr_wifi_nme_ap_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c
index d9ebce3e96194d3f8b31bbdfdbe119c6ac506c4c..2786a6bbff97b0ea915e5a496963b155f69f8f65 100644 (file)
--- a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 
-#include "csr_pmem.h"
 #include "csr_wifi_nme_ap_prim.h"
 #include "csr_wifi_nme_ap_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
index fed0ea2c03302b2a727cb7c35cd9cd43142d4201..d4014709112bb0cd1db2a4534e5a039ff922d18d 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_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
index ec670469536514dd42e4bf8eedfa66727b6769ed..fc44560b28b8b68a3305b320043e88756547e698 100644 (file)
--- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
@@ -13,6 +13,7 @@
 #ifndef CSR_WIFI_NME_AP_PRIM_H__
 #define CSR_WIFI_NME_AP_PRIM_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_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
index 8112aa04328b7f61ac5908d84fd83f226ad9b770..493e33e95e24bf50822aaefc3414832077e05236 100644 (file)
--- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 #include <linux/string.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
index 524da1420f17e417654aac5e8dde89d64f1b28ae..0f5782947223b238ed1911979254cabc8f590ac3 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_pmem.h"
 #include "csr_wifi_msgconv.h"
 
 #include "csr_wifi_nme_ap_prim.h"

diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h
index 04b7c31342c86932b3c23eec6ad57a8653dc03ab..709ece4649779d1a23781816c9d4f988a56323de 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_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/drivers/staging/csr/csr_wifi_nme_serialize.h b/drivers/staging/csr/csr_wifi_nme_serialize.h
index dca36d9f3a3ba7cc5d5e2de0343fad29885c29fd..c6b163660a3e288337346965e555dc8ab5077618 100644 (file)
--- a/drivers/staging/csr/csr_wifi_nme_serialize.h
+++ b/drivers/staging/csr/csr_wifi_nme_serialize.h
@@ -13,9 +13,7 @@
 #ifndef CSR_WIFI_NME_SERIALIZE_H__
 #define CSR_WIFI_NME_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
-
 #include "csr_wifi_nme_prim.h"
 
 #ifdef __cplusplus

diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.c b/drivers/staging/csr/csr_wifi_router_converter_init.c
index a3217865954b5d1afff2fddde01b80e295c99ced..775c013d05145c608f448684246ace0037977a20 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_router_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 

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 503f1afcb63b3da670002984f5eea95699ae2e71..a02e307e5a88e9b98a6cb13bdc31ec406e8624a5 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 #ifdef CSR_LOG_ENABLE

diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
index b4b724356c1e29a67de265f8c419bd8c8111d96b..7fa85fb4d6c0427417a29f5c4e3eeb5a939ed7cf 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_ctrl_prim.h"
 #include "csr_wifi_router_ctrl_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
index 4605c535b3b9d2379625694d6f80bc2dd34343bb..954b3defc49c7aff87adc924df7f2dd6ea589b5f 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_ctrl_prim.h"
 #include "csr_wifi_router_ctrl_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
index ba8e9836e435c27fec43d079103f49381a961a09..93d0fadf5e6fcf898cd42eb818607f8d2fe54c88 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_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
index e4b7ec9454904a976c98ba482ea5bc624896eaeb..b9f9adb5ad5d00243c778beea2278f9691261fd8 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 #include <linux/string.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
index f270377201890aeadcb7d91b8203b69382f289c3..2c2a229f4bf13a029a95e95c07d8b8c088fc93fe 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_pmem.h"
 #include "csr_wifi_msgconv.h"
 
 #include "csr_wifi_router_ctrl_prim.h"

diff --git a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
index fbd5b35551c26f5e564598ecd6cef13410dd00d5..c4badc565a91dc274c9dd91e740ef44c68792636 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_prim.h"
 #include "csr_wifi_router_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
index 60f6ecd4472e31949d7106c40cf415422cd83f95..de1086d7158d765b9715d2793ac97c43c09a11e7 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_router_prim.h"
 #include "csr_wifi_router_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h
index f2f5196d126ef46219394b62e703c1e17c222d84..06a2214714b7abcede273bc5461c35fed2216db7 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_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c
index adf37d472d20f7dee9f7c0562f06af6960e8d39b..5717ebc05b0b2cda4fbd85fb76ef540d9db3a029 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_serialize.c
+++ b/drivers/staging/csr/csr_wifi_router_serialize.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/drivers/staging/csr/csr_wifi_router_serialize.h b/drivers/staging/csr/csr_wifi_router_serialize.h
index 4951c404a3e9b15e3b325c4b074ebd2efbf61b5f..07e21b2b4363e9dcae34b5e547646c93dc5ff9d5 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_serialize.h
+++ b/drivers/staging/csr/csr_wifi_router_serialize.h
@@ -13,9 +13,7 @@
 #ifndef CSR_WIFI_ROUTER_SERIALIZE_H__
 #define CSR_WIFI_ROUTER_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
-
 #include "csr_wifi_router_prim.h"
 
 #ifdef __cplusplus

diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
index 23b0e5154a0ce0621067e3cf07fdf8133c2a6f8d..dd93d0061190117a4b522193a86f9359a7a02e52 100644 (file)
--- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_macro.h"
 #include "csr_msgconv.h"
 #include "csr_wifi_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 8825172724a8e1f43a04491bd8d55ee34ad5731e..350cb9ec3012af9531e732591b26a3ab1be4de28 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_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/drivers/staging/csr/csr_wifi_sme_converter_init.c b/drivers/staging/csr/csr_wifi_sme_converter_init.c
index 2d9c683e7cde85f24dbc332f3d6336d153b9cc53..31835f06bbc26257a92eb962580c05d05fb0062f 100644 (file)
--- a/drivers/staging/csr/csr_wifi_sme_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_sme_converter_init.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
 #include "csr_macro.h"
 
 

diff --git a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
index ae3fec896aaf8c6a055494d1fd953e887ee9a69b..03b5ddb22cd757ef602cb5a20be39778b64ae9cc 100644 (file)
--- a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_sme_prim.h"
 #include "csr_wifi_sme_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
index 1977747a51d10aa8d4a893c950cda897f9e0cfb9..c04767baaa5b4350aab3203330edca083818fe8b 100644 (file)
--- a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c
@@ -10,7 +10,6 @@
 
 /* Note: this is an auto-generated file. */
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_wifi_sme_prim.h"
 #include "csr_wifi_sme_lib.h"
 

diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h
index e20ae9895a2a7f28baecc5516171e288757220e6..3ca7456082526e487cb4f809a43cd2ac4773f728 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_pmem.h"
 #include "csr_sched.h"
 #include "csr_macro.h"
 #include "csr_msg_transport.h"

diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c
index a1db21189954fa9663583f0364d5cff52934d015..d55e3ee6921a63e51a0c2747fdf71074e46269f3 100644 (file)
--- a/drivers/staging/csr/csr_wifi_sme_serialize.c
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.c
@@ -11,7 +11,6 @@
 /* Note: this is an auto-generated file. */
 #include <linux/string.h>
 #include <linux/slab.h>
-#include "csr_pmem.h"
 #include "csr_msgconv.h"
 #include "csr_unicode.h"
 

diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.h b/drivers/staging/csr/csr_wifi_sme_serialize.h
index 9ea9d15fe0d8ca2d50f1dc5f190160577667785b..4f3af0a6be7c176af9dce4f0ca3f2d81effac2cf 100644 (file)
--- a/drivers/staging/csr/csr_wifi_sme_serialize.h
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.h
@@ -13,9 +13,7 @@
 #ifndef CSR_WIFI_SME_SERIALIZE_H__
 #define CSR_WIFI_SME_SERIALIZE_H__
 
-#include "csr_pmem.h"
 #include "csr_wifi_msgconv.h"
-
 #include "csr_wifi_sme_prim.h"
 
 #ifdef __cplusplus