staging: csr: remove CsrInt8 typedef

Use the in-kernel s8 type instead.

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_types.h b/drivers/staging/csr/csr_types.h
index 683e07772bfb196b4c1590d21c15549c8aebdb58..e2950602081f3999a51e84189d36f3819f704d6d 100644 (file)
--- a/drivers/staging/csr/csr_types.h
+++ b/drivers/staging/csr/csr_types.h
@@ -37,7 +37,6 @@ typedef uint16_t CsrUint16;
 typedef uint32_t CsrUint32;
 
 /* Signed fixed width types */
-typedef int8_t CsrInt8;
 typedef int16_t CsrInt16;
 typedef int32_t CsrInt32;
 

diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index 42fb7b0f968edf047619558b8c778d8be7357a01..6f709da07691a265199da3bbeed289812ccc681a 100644 (file)
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -43,7 +43,7 @@
 *       F1-F3    80-BF    80-BF    80-BF
 *       F4       80-8F    80-BF    80-BF
 */
-static const CsrInt8 trailingBytesForUtf8[256] =
+static const s8 trailingBytesForUtf8[256] =
 {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                 /* 0x00 - 0x1F */
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                 /* 0x20 - 0x3F */
@@ -568,7 +568,7 @@ CsrUtf16String *CsrUtf82Utf16String(const CsrUtf8String *utf8String)
     CsrSize sourceLength;
     CsrUtf16String *dest = NULL;
     CsrUtf16String *destStart = NULL;
-    CsrInt8 extraBytes2Read;
+    s8 extraBytes2Read;
 
     if (!utf8String)
     {

diff --git a/drivers/staging/csr/csr_wifi_hip_card.h b/drivers/staging/csr/csr_wifi_hip_card.h
index c99a6065b5b1d7c9b6f53a01e278675378cfcb66..fcaf27dd3534d9db58e9cbac7f446783a18c5815 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_card.h
+++ b/drivers/staging/csr/csr_wifi_hip_card.h
@@ -104,7 +104,7 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, CsrUint32 *paddr);
 CsrResult unifi_dl_firmware(card_t *card, void *arg);
 CsrResult unifi_dl_patch(card_t *card, void *arg, CsrUint32 boot_ctrl);
 CsrResult unifi_do_loader_op(card_t *card, CsrUint32 op_addr, u8 opcode);
-void* unifi_dl_fw_read_start(card_t *card, CsrInt8 is_fw);
+void* unifi_dl_fw_read_start(card_t *card, s8 is_fw);
 
 CsrResult unifi_coredump_handle_request(card_t *card);
 

diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
index d5066ace787de52dde755d6ee9ead85783399736..d98610f3389d81fb0444d1eb6035a9efc23a18e2 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
@@ -564,7 +564,7 @@ CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata)
  *      even address is read.
  * ---------------------------------------------------------------------------
  */
-static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len, CsrInt8 m, CsrUint32 *num)
+static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len, s8 m, CsrUint32 *num)
 {
     CsrResult r;
     CsrUint32 i;
@@ -583,7 +583,7 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd
         }
 
         *cptr++ = ((u8)w & 0xFF);
-        if ((m >= 0) && (((CsrInt8)w & 0xFF) == m))
+        if ((m >= 0) && (((s8)w & 0xFF) == m))
         {
             break;
         }
@@ -595,7 +595,7 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd
         }
 
         *cptr++ = ((u8)(w >> 8) & 0xFF);
-        if ((m >= 0) && (((CsrInt8)(w >> 8) & 0xFF) == m))
+        if ((m >= 0) && (((s8)(w >> 8) & 0xFF) == m))
         {
             break;
         }
@@ -1278,7 +1278,7 @@ CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata)
  *      CSR_WIFI_HIP_RESULT_INVALID_VALUE  a bad generic pointer was specified
  * ---------------------------------------------------------------------------
  */
-CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len, CsrInt8 match)
+CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len, s8 match)
 {
     CsrUint32 sdio_addr;
     CsrResult r;

diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c
index c43f589cb88e60ad87f60739cca95058ea484ee8..4f7dae8b33cdcb6240cf37ccd6c3a2cc03109271 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_download.c
+++ b/drivers/staging/csr/csr_wifi_hip_download.c
@@ -465,7 +465,7 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, CsrUint32 boot_ctrl)
 } /* unifi_dl_patch() */
 
 
-void* unifi_dl_fw_read_start(card_t *card, CsrInt8 is_fw)
+void* unifi_dl_fw_read_start(card_t *card, s8 is_fw)
 {
     card_info_t card_info;
 

diff --git a/drivers/staging/csr/csr_wifi_hip_dump.c b/drivers/staging/csr/csr_wifi_hip_dump.c
index 5297f103e9eb80679b98c1a1fffe78c62925a1cd..efa699f20dca22c539dcf6e21473cafa0d4937ff 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_dump.c
+++ b/drivers/staging/csr/csr_wifi_hip_dump.c
@@ -99,7 +99,7 @@ static const struct coredump_zone zonedef_table[HIP_CDUMP_NUM_ZONES] = {
  *      immediately after that, the mini-coredump can be captured.
  * ---------------------------------------------------------------------------
  */
-CsrResult unifi_coredump_request_at_next_reset(card_t *card, CsrInt8 enable)
+CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable)
 {
     CsrResult r;
 

diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h
index 62d77402b4ee435f509a4bf63b22f896372c61c3..1fb9d769424a9e7087a588388592dce6858d3dab 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_unifi.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifi.h
@@ -701,7 +701,7 @@ void unifi_get_hip_qos_info(card_t *card, unifi_HipQosInfo *hipqosinfo);
  *
  * @ingroup upperedge
  */
-void* unifi_fw_read_start(void *ospriv, CsrInt8 is_fw, const card_info_t *info);
+void* unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info);
 
 /**
  *
@@ -871,7 +871,7 @@ void unifi_debug_hex_to_buf(const CsrCharString *buff, CsrUint16 length);
 /* Mini-coredump utility functions */
 CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req);
 CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req);
-CsrResult unifi_coredump_request_at_next_reset(card_t *card, CsrInt8 enable);
+CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable);
 CsrResult unifi_coredump_init(card_t *card, CsrUint16 num_dump_buffers);
 void unifi_coredump_free(card_t *card);
 

diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h
index c9734a7339fe2ef1bd753327bf9cdf5bb8787730..700f268ca769e2c2fafc5ca39219b33fa976b017 100644 (file)
--- a/drivers/staging/csr/csr_wifi_sme_prim.h
+++ b/drivers/staging/csr/csr_wifi_sme_prim.h
@@ -3087,12 +3087,12 @@ typedef struct
     CsrWifiSmeScanConfigData scanCfg[4];
     CsrBool                  disableAutonomousScans;
     CsrUint16                maxResults;
-    CsrInt8                  highRssiThreshold;
-    CsrInt8                  lowRssiThreshold;
-    CsrInt8                  deltaRssiThreshold;
-    CsrInt8                  highSnrThreshold;
-    CsrInt8                  lowSnrThreshold;
-    CsrInt8                  deltaSnrThreshold;
+    s8                  highRssiThreshold;
+    s8                  lowRssiThreshold;
+    s8                  deltaRssiThreshold;
+    s8                  highSnrThreshold;
+    s8                  lowSnrThreshold;
+    s8                  deltaSnrThreshold;
     CsrUint16                passiveChannelListCount;
     u8                *passiveChannelList;
 } CsrWifiSmeScanConfig;

diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c
index 4558629f8bd32a5285f541f280259fe3dab0a318..f35f83685250cf3391fad40f7e370f4905f78c68 100644 (file)
--- a/drivers/staging/csr/csr_wifi_sme_serialize.c
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.c
@@ -1133,12 +1133,12 @@ CsrSize CsrWifiSmeScanConfigSetReqSizeof(void *msg)
     }
     bufferSize += 1;                                             /* CsrBool primitive->scanConfig.disableAutonomousScans */
     bufferSize += 2;                                             /* CsrUint16 primitive->scanConfig.maxResults */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.highRssiThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.lowRssiThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.deltaRssiThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.highSnrThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.lowSnrThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.deltaSnrThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.highRssiThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.lowRssiThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.deltaRssiThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.highSnrThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.lowSnrThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.deltaSnrThreshold */
     bufferSize += 2;                                             /* CsrUint16 primitive->scanConfig.passiveChannelListCount */
     bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */
     return bufferSize;
@@ -4412,12 +4412,12 @@ CsrSize CsrWifiSmeScanConfigGetCfmSizeof(void *msg)
     }
     bufferSize += 1;                                             /* CsrBool primitive->scanConfig.disableAutonomousScans */
     bufferSize += 2;                                             /* CsrUint16 primitive->scanConfig.maxResults */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.highRssiThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.lowRssiThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.deltaRssiThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.highSnrThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.lowSnrThreshold */
-    bufferSize += 1;                                             /* CsrInt8 primitive->scanConfig.deltaSnrThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.highRssiThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.lowRssiThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.deltaRssiThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.highSnrThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.lowSnrThreshold */
+    bufferSize += 1;                                             /* s8 primitive->scanConfig.deltaSnrThreshold */
     bufferSize += 2;                                             /* CsrUint16 primitive->scanConfig.passiveChannelListCount */
     bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */
     return bufferSize;

diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c
index 98e27d6f440ea7b599dfb41e61c310255c88448b..8199ff98bbdb76b3865f54fac51a7e8820fa93b2 100644 (file)
--- a/drivers/staging/csr/firmware.c
+++ b/drivers/staging/csr/firmware.c
@@ -57,7 +57,7 @@
  * ---------------------------------------------------------------------------
  */
 void*
-unifi_fw_read_start(void *ospriv, CsrInt8 is_fw, const card_info_t *info)
+unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info)
 {
     unifi_priv_t *priv = (unifi_priv_t*)ospriv;
     CSR_UNUSED(info);

diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
index e18395c16549b83c0167803e353d85294599b01d..cef0ba367bdbb0729d4a6b6c1552873ec6ce9848 100644 (file)
--- a/drivers/staging/csr/netdev.c
+++ b/drivers/staging/csr/netdev.c
@@ -1080,7 +1080,7 @@ skb_add_llc_snap(struct net_device *dev, struct sk_buff *skb, int proto)
 #ifdef CSR_SUPPORT_SME
 static int
 _identify_sme_ma_pkt_ind(unifi_priv_t *priv,
-                         const CsrInt8 *oui, CsrUint16 protocol,
+                         const s8 *oui, CsrUint16 protocol,
                          const CSR_SIGNAL *signal,
                          bulk_data_param_t *bulkdata,
                          const unsigned char *daddr,
@@ -1657,7 +1657,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
     CsrUint16 interfaceTag;
     CsrWifiMacAddress peerAddress;
     CSR_TRANSMISSION_CONTROL transmissionControl = CSR_NO_CONFIRM_REQUIRED;
-    CsrInt8 protection;
+    s8 protection;
     netInterface_priv_t *interfacePriv = NULL;
     CSR_RATE TransmitRate = (CSR_RATE)0;
 

diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c
index a84d99f7892cc299945167aa45699f28112e34ec..e28e7c8ce0c2fedefb690c6625ca801df8eea3f0 100644 (file)
--- a/drivers/staging/csr/sme_sys.c
+++ b/drivers/staging/csr/sme_sys.c
@@ -404,7 +404,7 @@ uf_send_gratuitous_arp(unifi_priv_t *priv, CsrUint16 interfaceTag)
     bulk_data_param_t bulkdata;
     CsrResult csrResult;
     struct sk_buff *skb, *newSkb = NULL;
-    CsrInt8 protection;
+    s8 protection;
     int r;
     static const u8 arp_req[36] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00,
                                          0x08, 0x06, 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x01,
@@ -1366,7 +1366,7 @@ _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal,
     CsrResult csrResult;
     CsrUint16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff;
     CsrBool eapolStore = FALSE;
-    CsrInt8 protection = 0;
+    s8 protection = 0;
     netInterface_priv_t *interfacePriv;
     unsigned long flags;
 

diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c
index 3c0491b0d312546a63f0d87069a9420877744784..a007a59aef95e9f53f13849c9f3de1e58a837c56 100644 (file)
--- a/drivers/staging/csr/unifi_pdu_processing.c
+++ b/drivers/staging/csr/unifi_pdu_processing.c
@@ -1976,9 +1976,9 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv,
 }
 
 #ifdef CSR_SUPPORT_SME
-CsrInt8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr)
+s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr)
 {
-    CsrInt8 protection = 0;
+    s8 protection = 0;
     netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
 
     switch(interfacePriv->interfaceMode)
@@ -2205,7 +2205,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata,
 
 static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord)
 {
-    CsrInt8 i;
+    s8 i;
 
     for(i=UNIFI_TRAFFIC_Q_VO; i >= UNIFI_TRAFFIC_Q_BK; i--)
     {
@@ -2223,7 +2223,7 @@ static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouter
 
 static CsrBool uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue)
 {
-    CsrInt8 i;
+    s8 i;
 
     for(i = queue; i >= UNIFI_TRAFFIC_Q_BK; i--)
     {
@@ -2269,7 +2269,7 @@ void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv,
     tx_buffered_packets_t * buffered_pkt = NULL;
     unsigned long lock_flags;
     CsrBool eosp=FALSE;
-    CsrInt8 r =0;
+    s8 r =0;
     CsrBool moreData = FALSE;
     netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
 
@@ -2370,7 +2370,7 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv,
     unsigned long lock_flags;
     CsrBool eosp=FALSE;
     CsrBool moreData = FALSE;
-    CsrInt8 r =0;
+    s8 r =0;
 
     func_enter();
 
@@ -2639,7 +2639,7 @@ int uf_process_station_records_for_sending_data(unifi_priv_t *priv,CsrUint16 int
 static void uf_handle_uspframes_delivery(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t *staInfo, CsrUint16 interfaceTag)
 {
 
-    CsrInt8 i;
+    s8 i;
     u8 allDeliveryEnabled = 0, dataAvailable = 0;
     netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
     unsigned long lock_flags;
@@ -3059,7 +3059,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,CsrUint16 inte
     tx_buffered_packets_t * buffered_pkt = NULL;
     CsrWifiMacAddress peerMacAddress;
     unsigned long lock_flags;
-    CsrInt8 r =0;
+    s8 r =0;
     CsrBool moreData = FALSE;
     netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
 
@@ -3233,7 +3233,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,CsrUint16 inte
                 }
 
         } else {
-            CsrInt8 i;
+            s8 i;
             /* We dont have buffered packet in mangement frame queue (1 failed), So proceed with condition 2
              * UNIFI_TRAFFIC_Q_VO -> VI -> BE -> BK
              */

diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h
index 666e17f02f66f41dada15c8f04ce038ac7e2e67f..f56c7025380ed3c2a30d6796195e09743be641f7 100644 (file)
--- a/drivers/staging/csr/unifi_priv.h
+++ b/drivers/staging/csr/unifi_priv.h
@@ -1071,7 +1071,7 @@ CsrBool blockack_session_stop(unifi_priv_t *priv,
                               CsrWifiMacAddress macAddress);
 #ifdef CSR_SUPPORT_SME
 /* Fetch the protection information from interface Mode */
-CsrInt8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr);
+s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr);
 #endif
 
 /* Fetch the station record handler from data base for matching Mac address */