ath6kl: Replace data type macros with kernel defined ones
authorVasanthakumar Thiagarajan <vasanth@atheros.com>
Mon, 2 May 2011 05:52:49 +0000 (11:22 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 3 May 2011 19:29:58 +0000 (12:29 -0700)
Now athtypes_linux.h and a_types.h are unused, remove them.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
28 files changed:
drivers/staging/ath6kl/bmi/include/bmi_internal.h
drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
drivers/staging/ath6kl/htc2/AR6000/ar6k.c
drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
drivers/staging/ath6kl/htc2/htc_internal.h
drivers/staging/ath6kl/include/a_debug.h
drivers/staging/ath6kl/include/a_types.h [deleted file]
drivers/staging/ath6kl/include/bmi.h
drivers/staging/ath6kl/include/common/targaddrs.h
drivers/staging/ath6kl/include/common/wmi.h
drivers/staging/ath6kl/include/hif.h
drivers/staging/ath6kl/miscdrv/ar3kconfig.c
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
drivers/staging/ath6kl/miscdrv/common_drv.c
drivers/staging/ath6kl/miscdrv/credit_dist.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c
drivers/staging/ath6kl/os/linux/export_hci_transport.c
drivers/staging/ath6kl/os/linux/hci_bridge.c
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
drivers/staging/ath6kl/os/linux/include/athtypes_linux.h [deleted file]
drivers/staging/ath6kl/os/linux/netbuf.c
drivers/staging/ath6kl/reorder/rcv_aggr.c
drivers/staging/ath6kl/wlan/src/wlan_node.c
drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
drivers/staging/ath6kl/wlan/src/wlan_utils.c
drivers/staging/ath6kl/wmi/wmi.c

index b18d3d33255f1c8ce3d1b3d7714d0c90dd5eb5f7..8e2577074d659a641ef2467706ee58033e0ddb2d 100644 (file)
@@ -26,7 +26,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #define ATH_MODULE_NAME bmi
 #include "a_debug.h"
index 6341560b2108262a4e8e3d45cc500b40c484fb56..ed7ad4786f5a517d1440a57fb0376cc2ea7936f7 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #include "hif.h"
 #include "../../../common/hif_sdio_common.h"
index c90f976568d8070fb55ffb3e2af6ba4bd97dc2cc..f8607bc08929112805afffb9665fbe82cce68207 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "hw/mbox_host_reg.h"
 #include "a_osapi.h"
 #include "../htc_debug.h"
index 0f209d3a173c74365236bc12fa12656142aec519..d7af68f70560e712d845e9a4502993202e58bdc2 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "hw/mbox_host_reg.h"
 #include "a_osapi.h"
 #include "../htc_debug.h"
index 374001155feb08067723b35eb84d4b73c3a4b3fe..725540f9adde9d3ae7c8c762ca05eec0913bf5ab 100644 (file)
@@ -24,7 +24,6 @@
 //==============================================================================
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #include "../htc_debug.h"
 #include "hif.h"
index 2603a928b800ae2aba0f4f8f73debcafec4c50b3..56a0d7143804b1449411dc54459544ab5d34feb1 100644 (file)
@@ -24,7 +24,6 @@
 //==============================================================================
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #include "../htc_debug.h"
 #include "hif.h"
index 1c9aeca411431f03c52584ee32b0bdda327f6270..cac97351769aea439f80321187705c45154499d0 100644 (file)
@@ -36,7 +36,6 @@ extern "C" {
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #include "htc_debug.h"
 #include "htc.h"
index 51cb633ee6ce136540c770aabd2c8e4944151171..5154fcb1ca64880237c421c9d60a186c688cb026 100644 (file)
@@ -27,7 +27,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <a_types.h>
 #include <a_osapi.h>
 
     /* standard debug print masks bits 0..7 */
diff --git a/drivers/staging/ath6kl/include/a_types.h b/drivers/staging/ath6kl/include/a_types.h
deleted file mode 100644 (file)
index 4b6783f..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//------------------------------------------------------------------------------
-// <copyright file="a_types.h" company="Atheros">
-//    Copyright (c) 2004-2010 Atheros Corporation.  All rights reserved.
-// 
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-//
-//------------------------------------------------------------------------------
-//==============================================================================
-// This file contains the definitions of the basic atheros data types.
-// It is used to map the data types in atheros files to a platform specific
-// type.
-//
-// Author(s): ="Atheros"
-//==============================================================================
-#ifndef _A_TYPES_H_
-#define _A_TYPES_H_
-
-#include "../os/linux/include/athtypes_linux.h"
-
-#endif /* _ATHTYPES_H_ */
index eb1e75607247dcfdf757d83fb4ad7180cb21a3db..d3227f77fa5d5677b7da16a1138a4aa1a47d6061 100644 (file)
@@ -32,7 +32,6 @@ extern "C" {
 /* Header files */
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "hif.h"
 #include "a_osapi.h"
 #include "bmi_msg.h"
index b172209799bb5f3328539630fa667005096e4f4e..c866cefbd8fd8051e0ec2d10a09c4a6493a8ab90 100644 (file)
@@ -345,7 +345,7 @@ valid */
     (u32)((unsigned long)&((((struct host_interest_s *)(AR6003_HOST_INTEREST_ADDRESS))->item)))
 
 #define AR6004_HOST_INTEREST_ITEM_ADDRESS(item) \
-        ((A_UINT32)&((((struct host_interest_s *)(AR6004_HOST_INTEREST_ADDRESS))->item)))
+        ((u32)&((((struct host_interest_s *)(AR6004_HOST_INTEREST_ADDRESS))->item)))
 
 
 #define HOST_INTEREST_DBGLOG_IS_ENABLED() \
index 65498395ea14e299d1b24c6226f0ba45e1f0a4b9..d9687443d32ce7a19073f8884fc5fd5f5585dadb 100644 (file)
@@ -616,7 +616,7 @@ typedef PREPACK struct {
  * WMI_SET_EXCESS_TX_RETRY_THRES_CMDID
  */
 typedef PREPACK struct {
-    A_UINT32 threshold;
+    u32 threshold;
 } POSTPACK WMI_SET_EXCESS_TX_RETRY_THRES_CMD;
 
 /*
index 83650d5ce3fb255891fb527f7a13fdf0c5976cea..24200e778c3bcb58d692b0817f58bcba37f5fff8 100644 (file)
@@ -32,7 +32,6 @@ extern "C" {
 /* Header files */
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #include "dl_list.h"
 
@@ -148,7 +147,7 @@ typedef enum {
  *
  *   HIF_DEVICE_GET_MBOX_BLOCK_SIZE
  *   input : none
- *   output : array of 4 A_UINT32s
+ *   output : array of 4 u32s
  *   notes: block size is returned for each mailbox (4)
  *
  *   HIF_DEVICE_GET_MBOX_ADDR
index 5125edcca90a6cfd0d4a70d5dd2d904b730c5aa9..e0ea2183019dd9a0d03d67791f49bbcd3a50e4f8 100644 (file)
@@ -24,7 +24,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #define ATH_MODULE_NAME misc
 #include "a_debug.h"
index cd0a9e827cffcf6b132220446015c1df4fd45bd2..4e0f2f713a40edc53245ddb89e34ee19deccd8f5 100644 (file)
@@ -33,7 +33,6 @@
 #include "athdefs.h"
 #ifdef HCI_TRANSPORT_SDIO
 #include "a_config.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #define ATH_MODULE_NAME misc
 #include "a_debug.h"
index 951c6e461fc242d086bc29cde661cd3dbe7adbed..43b8693d42b2660a4b2830adc0af2596063bcfd0 100644 (file)
@@ -23,7 +23,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 
 #include "hw/mbox_host_reg.h"
 #include "hw/si_reg.h"
index 33fa0209026d7e3982602686f5e2419a47afd229..c777e98a756e38d2daca9b8d704c72e73b4c7ba6 100644 (file)
@@ -23,7 +23,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #define ATH_MODULE_NAME misc
 #include "a_debug.h"
index 93ebff433bce9f53989c77a62cca7582fdc8576e..513f205b279d0df63cbba792bf2b3cb792c3a103 100644 (file)
@@ -1485,7 +1485,7 @@ ar6000_configure_target(struct ar6_softc *ar)
      */
 
        if (ar->arTargetType == TARGET_TYPE_AR6003) {
-               A_UINT32 ramReservedSz;
+               u32 ramReservedSz;
                if (ar->arVersion.target_ver == AR6003_REV2_VERSION) {
                        param = AR6003_REV2_BOARD_EXT_DATA_ADDRESS;
                        ramReservedSz =  AR6003_REV2_RAM_RESERVE_SIZE;
@@ -2676,7 +2676,7 @@ int ar6000_init(struct net_device *dev)
     }
 
        if (regscanmode) {
-               A_UINT32 param;
+               u32 param;
 
                if (BMIReadMemory(ar->arHifDevice,
                                  HOST_INTEREST_ITEM_ADDRESS(ar,
index 442a2860d24abffbf8def06f5f3f39084d141be4..430998edacc4cdb8e8593fc08514aec81f7c7aab 100644 (file)
@@ -23,7 +23,6 @@
 //==============================================================================
 #include <a_config.h>
 #include <athdefs.h>
-#include "a_types.h"
 #include "a_osapi.h"
 #include "htc_api.h"
 #include "a_drv.h"
index ac08bcbc4f263313ca0e1900c52725971c9720d4..6087edcb1d6a47f8fce95b13424eb63b2148afad 100644 (file)
@@ -26,7 +26,6 @@
 #include <linux/etherdevice.h>
 #include <a_config.h>
 #include <athdefs.h>
-#include "a_types.h"
 #include "a_osapi.h"
 #include "htc_api.h"
 #include "wmi.h"
index 0c50c7a872b1549c2e89914abb87c7c81f6185b3..081e877e5df13f625bcd9d34c94d171e17ce5f2f 100644 (file)
@@ -39,7 +39,6 @@
 
 #include <a_config.h>
 #include <athdefs.h>
-#include "a_types.h"
 #include "a_osapi.h"
 #include "htc_api.h"
 #include "wmi.h"
diff --git a/drivers/staging/ath6kl/os/linux/include/athtypes_linux.h b/drivers/staging/ath6kl/os/linux/include/athtypes_linux.h
deleted file mode 100644 (file)
index 8cb5632..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This file contains the definitions of the basic atheros data types.
-// It is used to map the data types in atheros files to a platform specific
-// type.
-// Copyright (c) 2004-2010 Atheros Communications Inc.
-// All rights reserved.
-//
-// 
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-//
-//
-// Author(s): ="Atheros"
-//------------------------------------------------------------------------------
-
-#ifndef _ATHTYPES_LINUX_H_
-#define _ATHTYPES_LINUX_H_
-
-#ifdef __KERNEL__
-#include <linux/types.h>
-#else
-#include <sys/types.h>
-#endif
-
-typedef int8_t      A_INT8;
-typedef int16_t     A_INT16;
-typedef int32_t     A_INT32;
-typedef int64_t     A_INT64;
-
-typedef u_int8_t     A_UINT8;
-typedef u_int16_t    A_UINT16;
-typedef u_int32_t    A_UINT32;
-typedef u_int64_t    A_UINT64;
-
-typedef char            A_CHAR;
-typedef unsigned long   A_ATH_TIMER;
-
-
-#endif /* _ATHTYPES_LINUX_H_ */
index a9c96b315c4888319f629d9e1069e11d20f536c8..963a2fb76a9268c964716b6461993bd614524ce9 100644 (file)
@@ -22,7 +22,6 @@
 //------------------------------------------------------------------------------
 #include <a_config.h>
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #include "htc_packet.h"
 
index 788d0884f0648fb47d9747e57e9143259f2c2076..9b1509ec5a7ba1b86236148796953fde18ffd219 100644 (file)
@@ -23,7 +23,6 @@
 
 #include <a_config.h>
 #include <athdefs.h>
-#include <a_types.h>
 #include <a_osapi.h>
 #include <a_debug.h>
 #include "pkt_log.h"
@@ -38,7 +37,7 @@ static void
 aggr_slice_amsdu(struct aggr_info *p_aggr, struct rxtid *rxtid, void **osbuf);
 
 static void
-aggr_timeout(A_ATH_TIMER arg);
+aggr_timeout(unsigned long arg);
 
 static void
 aggr_deque_frms(struct aggr_info *p_aggr, u8 tid, u16 seq_no, u8 order);
@@ -571,7 +570,7 @@ aggr_reset_state(void *cntxt)
 
 
 static void
-aggr_timeout(A_ATH_TIMER arg)
+aggr_timeout(unsigned long arg)
 {
     u8 i,j;
     struct aggr_info *p_aggr = (struct aggr_info *)arg;
index b166dd44893cba207d8733bf3f51e16fb14e2835..0fe5f4b1346c939807c708e6aee2434a2f2e54d1 100644 (file)
@@ -24,7 +24,6 @@
 //==============================================================================
 #include <a_config.h>
 #include <athdefs.h>
-#include <a_types.h>
 #include <a_osapi.h>
 #define ATH_MODULE_NAME wlan
 #include <a_debug.h>
@@ -54,7 +53,7 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(wlan,
 #endif
 
 #ifdef THREAD_X
-static void wlan_node_timeout(A_ATH_TIMER arg);
+static void wlan_node_timeout(unsigned long arg);
 #endif
 
 static bss_t * _ieee80211_find_node (struct ieee80211_node_table *nt,
@@ -375,7 +374,7 @@ wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt)
 
 #ifdef THREAD_X
 static void
-wlan_node_timeout (A_ATH_TIMER arg)
+wlan_node_timeout (unsigned long arg)
 {
     struct ieee80211_node_table *nt = (struct ieee80211_node_table *)arg;
     bss_t *bss, *nextBss;
index 9ebfecff54f9a31402ae68abad45ea38ba87941e..07b8313b16e889b7af3847ae7fad997303b26b7c 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "a_config.h"
 #include "athdefs.h"
-#include "a_types.h"
 #include "a_osapi.h"
 #include <wmi.h>
 #include <ieee80211.h>
index fd05e39f41185370c5dab7acca191d9f06208f84..bc91599d9bf6bb946227e2b353a06c0f57358218 100644 (file)
@@ -24,7 +24,6 @@
 //==============================================================================
 #include <a_config.h>
 #include <athdefs.h>
-#include <a_types.h>
 #include <a_osapi.h>
 
 /*
index c3a1cc5fe7be627152d63c463071cc052c117a67..781c65620835401c57397a0ba9ba31614fe4fdba 100644 (file)
@@ -25,7 +25,6 @@
 
 #include <a_config.h>
 #include <athdefs.h>
-#include <a_types.h>
 #include <a_osapi.h>
 #include "htc.h"
 #include "htc_api.h"