From: Vasanthakumar Thiagarajan Date: Mon, 2 May 2011 05:52:49 +0000 (+0530) Subject: ath6kl: Replace data type macros with kernel defined ones X-Git-Tag: firefly_0821_release~7613^2~1326^2~594 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0b0c87416fd69541ce8efc8703c839500671e7d6;p=firefly-linux-kernel-4.4.55.git ath6kl: Replace data type macros with kernel defined ones Now athtypes_linux.h and a_types.h are unused, remove them. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ath6kl/bmi/include/bmi_internal.h b/drivers/staging/ath6kl/bmi/include/bmi_internal.h index b18d3d33255f..8e2577074d65 100644 --- a/drivers/staging/ath6kl/bmi/include/bmi_internal.h +++ b/drivers/staging/ath6kl/bmi/include/bmi_internal.h @@ -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" diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h index 6341560b2108..ed7ad4786f5a 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h @@ -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" diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c index c90f976568d8..f8607bc08929 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c @@ -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" diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c index 0f209d3a173c..d7af68f70560 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c @@ -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" diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c index 374001155feb..725540f9adde 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c @@ -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" diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c index 2603a928b800..56a0d7143804 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c @@ -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" diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h index 1c9aeca41143..cac97351769a 100644 --- a/drivers/staging/ath6kl/htc2/htc_internal.h +++ b/drivers/staging/ath6kl/htc2/htc_internal.h @@ -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" diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h index 51cb633ee6ce..5154fcb1ca64 100644 --- a/drivers/staging/ath6kl/include/a_debug.h +++ b/drivers/staging/ath6kl/include/a_debug.h @@ -27,7 +27,6 @@ extern "C" { #endif /* __cplusplus */ -#include #include /* 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 index 4b6783f6aec7..000000000000 --- a/drivers/staging/ath6kl/include/a_types.h +++ /dev/null @@ -1,32 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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_ */ diff --git a/drivers/staging/ath6kl/include/bmi.h b/drivers/staging/ath6kl/include/bmi.h index eb1e75607247..d3227f77fa5d 100644 --- a/drivers/staging/ath6kl/include/bmi.h +++ b/drivers/staging/ath6kl/include/bmi.h @@ -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" diff --git a/drivers/staging/ath6kl/include/common/targaddrs.h b/drivers/staging/ath6kl/include/common/targaddrs.h index b172209799bb..c866cefbd8fd 100644 --- a/drivers/staging/ath6kl/include/common/targaddrs.h +++ b/drivers/staging/ath6kl/include/common/targaddrs.h @@ -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() \ diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index 65498395ea14..d9687443d32c 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h @@ -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; /* diff --git a/drivers/staging/ath6kl/include/hif.h b/drivers/staging/ath6kl/include/hif.h index 83650d5ce3fb..24200e778c3b 100644 --- a/drivers/staging/ath6kl/include/hif.h +++ b/drivers/staging/ath6kl/include/hif.h @@ -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 diff --git a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c index 5125edcca90a..e0ea2183019d 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c @@ -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" diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h index cd0a9e827cff..4e0f2f713a40 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h @@ -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" diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c index 951c6e461fc2..43b8693d42b2 100644 --- a/drivers/staging/ath6kl/miscdrv/common_drv.c +++ b/drivers/staging/ath6kl/miscdrv/common_drv.c @@ -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" diff --git a/drivers/staging/ath6kl/miscdrv/credit_dist.c b/drivers/staging/ath6kl/miscdrv/credit_dist.c index 33fa0209026d..c777e98a756e 100644 --- a/drivers/staging/ath6kl/miscdrv/credit_dist.c +++ b/drivers/staging/ath6kl/miscdrv/credit_dist.c @@ -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" diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index 93ebff433bce..513f205b279d 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -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, diff --git a/drivers/staging/ath6kl/os/linux/export_hci_transport.c b/drivers/staging/ath6kl/os/linux/export_hci_transport.c index 442a2860d24a..430998edacc4 100644 --- a/drivers/staging/ath6kl/os/linux/export_hci_transport.c +++ b/drivers/staging/ath6kl/os/linux/export_hci_transport.c @@ -23,7 +23,6 @@ //============================================================================== #include #include -#include "a_types.h" #include "a_osapi.h" #include "htc_api.h" #include "a_drv.h" diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c index ac08bcbc4f26..6087edcb1d6a 100644 --- a/drivers/staging/ath6kl/os/linux/hci_bridge.c +++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c @@ -26,7 +26,6 @@ #include #include #include -#include "a_types.h" #include "a_osapi.h" #include "htc_api.h" #include "wmi.h" diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index 0c50c7a872b1..081e877e5df1 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h @@ -39,7 +39,6 @@ #include #include -#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 index 8cb563203057..000000000000 --- a/drivers/staging/ath6kl/os/linux/include/athtypes_linux.h +++ /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 -#else -#include -#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_ */ diff --git a/drivers/staging/ath6kl/os/linux/netbuf.c b/drivers/staging/ath6kl/os/linux/netbuf.c index a9c96b315c48..963a2fb76a92 100644 --- a/drivers/staging/ath6kl/os/linux/netbuf.c +++ b/drivers/staging/ath6kl/os/linux/netbuf.c @@ -22,7 +22,6 @@ //------------------------------------------------------------------------------ #include #include "athdefs.h" -#include "a_types.h" #include "a_osapi.h" #include "htc_packet.h" diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c index 788d0884f064..9b1509ec5a7b 100644 --- a/drivers/staging/ath6kl/reorder/rcv_aggr.c +++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c @@ -23,7 +23,6 @@ #include #include -#include #include #include #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; diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c index b166dd44893c..0fe5f4b1346c 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_node.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c @@ -24,7 +24,6 @@ //============================================================================== #include #include -#include #include #define ATH_MODULE_NAME wlan #include @@ -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; diff --git a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c index 9ebfecff54f9..07b8313b16e8 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c @@ -25,7 +25,6 @@ #include "a_config.h" #include "athdefs.h" -#include "a_types.h" #include "a_osapi.h" #include #include diff --git a/drivers/staging/ath6kl/wlan/src/wlan_utils.c b/drivers/staging/ath6kl/wlan/src/wlan_utils.c index fd05e39f4118..bc91599d9bf6 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_utils.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_utils.c @@ -24,7 +24,6 @@ //============================================================================== #include #include -#include #include /* diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index c3a1cc5fe7be..781c65620835 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c @@ -25,7 +25,6 @@ #include #include -#include #include #include "htc.h" #include "htc_api.h"