Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[firefly-linux-kernel-4.4.55.git] / drivers / staging / csr / csr_wifi_router_converter_init.c

diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.c b/drivers/staging/csr/csr_wifi_router_converter_init.c
index f7ee3f0ec37d62e546a25c88712a182db1be644a..775c013d05145c608f448684246ace0037977a20 100644 (file)
--- a/drivers/staging/csr/csr_wifi_router_converter_init.c
+++ b/drivers/staging/csr/csr_wifi_router_converter_init.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2011
+            (c) Cambridge Silicon Radio Limited 2012
             All rights reserved and confidential information of CSR
 
             Refer to LICENSE.txt included with this source for details
@@ -11,8 +11,7 @@
 /* Note: this is an auto-generated file. */
 
 #include "csr_msgconv.h"
-#include "csr_pmem.h"
-#include "csr_util.h"
+#include "csr_macro.h"
 
 
 #ifdef CSR_LOG_ENABLE
@@ -37,15 +36,15 @@ static CsrMsgConvMsgEntry csrwifirouter_conv_lut[] = {
     { 0, NULL, NULL, NULL, NULL },
 };
 
-CsrMsgConvMsgEntry* CsrWifiRouterConverterLookup(CsrMsgConvMsgEntry *ce, CsrUint16 msgType)
+CsrMsgConvMsgEntry* CsrWifiRouterConverterLookup(CsrMsgConvMsgEntry *ce, u16 msgType)
 {
     if (msgType & CSR_PRIM_UPSTREAM)
     {
-        CsrUint16 index = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT;
-        if (index < (CSR_WIFI_ROUTER_PRIM_UPSTREAM_COUNT + CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT) &&
-            csrwifirouter_conv_lut[index].msgType == msgType)
+        u16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT;
+        if (idx < (CSR_WIFI_ROUTER_PRIM_UPSTREAM_COUNT + CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT) &&
+            csrwifirouter_conv_lut[idx].msgType == msgType)
         {
-            return &csrwifirouter_conv_lut[index];
+            return &csrwifirouter_conv_lut[idx];
         }
     }
     else
@@ -70,7 +69,7 @@ void CsrWifiRouterConverterInit(void)
 #ifdef CSR_LOG_ENABLE
 static const CsrLogPrimitiveInformation csrwifirouter_conv_info = {
     CSR_WIFI_ROUTER_PRIM,
-    (CsrCharString *)"CSR_WIFI_ROUTER_PRIM",
+    (char *)"CSR_WIFI_ROUTER_PRIM",
     csrwifirouter_conv_lut
 };
 const CsrLogPrimitiveInformation* CsrWifiRouterTechInfoGet(void)