diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-10-05 05:23:42 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-11 05:50:55 -0500 |
commit | 533cbbb686684dcf9915e5890df29f5cca05d173 (patch) | |
tree | 774037855028fa49b217e3ebb0c22e6f11695f16 | |
parent | 8e8ddb2b8d19a952e1dff7a2a8a9d606e52fc3e3 (diff) |
ath6kl: remove unused values from htc_hif.h
Also remove some cache line optimisation. It was using hardcoded values
which is wrong.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/htc_hif.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.h b/drivers/net/wireless/ath/ath6kl/htc_hif.h index 5572c23b46f1..a8a6de552162 100644 --- a/drivers/net/wireless/ath/ath6kl/htc_hif.h +++ b/drivers/net/wireless/ath/ath6kl/htc_hif.h | |||
@@ -20,29 +20,16 @@ | |||
20 | #include "htc.h" | 20 | #include "htc.h" |
21 | #include "hif.h" | 21 | #include "hif.h" |
22 | 22 | ||
23 | #define ATH6KL_MAILBOXES 4 | ||
24 | |||
25 | /* HTC runs over mailbox 0 */ | 23 | /* HTC runs over mailbox 0 */ |
26 | #define HTC_MAILBOX 0 | 24 | #define HTC_MAILBOX 0 |
27 | 25 | ||
28 | #define ATH6KL_TARGET_DEBUG_INTR_MASK 0x01 | 26 | #define ATH6KL_TARGET_DEBUG_INTR_MASK 0x01 |
29 | 27 | ||
30 | #define OTHER_INTS_ENABLED (INT_STATUS_ENABLE_ERROR_MASK | \ | 28 | /* FIXME: are these duplicates with MAX_SCATTER_ values in hif.h? */ |
31 | INT_STATUS_ENABLE_CPU_MASK | \ | ||
32 | INT_STATUS_ENABLE_COUNTER_MASK) | ||
33 | |||
34 | #define ATH6KL_REG_IO_BUFFER_SIZE 32 | ||
35 | #define ATH6KL_MAX_REG_IO_BUFFERS 8 | ||
36 | #define ATH6KL_SCATTER_ENTRIES_PER_REQ 16 | 29 | #define ATH6KL_SCATTER_ENTRIES_PER_REQ 16 |
37 | #define ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER (16 * 1024) | 30 | #define ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER (16 * 1024) |
38 | #define ATH6KL_SCATTER_REQS 4 | 31 | #define ATH6KL_SCATTER_REQS 4 |
39 | 32 | ||
40 | #ifndef A_CACHE_LINE_PAD | ||
41 | #define A_CACHE_LINE_PAD 128 | ||
42 | #endif | ||
43 | #define ATH6KL_MIN_SCATTER_ENTRIES_PER_REQ 2 | ||
44 | #define ATH6KL_MIN_TRANSFER_SIZE_PER_SCATTER (4 * 1024) | ||
45 | |||
46 | struct ath6kl_irq_proc_registers { | 33 | struct ath6kl_irq_proc_registers { |
47 | u8 host_int_status; | 34 | u8 host_int_status; |
48 | u8 cpu_int_status; | 35 | u8 cpu_int_status; |
@@ -65,11 +52,8 @@ struct ath6kl_irq_enable_reg { | |||
65 | 52 | ||
66 | struct ath6kl_device { | 53 | struct ath6kl_device { |
67 | spinlock_t lock; | 54 | spinlock_t lock; |
68 | u8 pad1[A_CACHE_LINE_PAD]; | ||
69 | struct ath6kl_irq_proc_registers irq_proc_reg; | 55 | struct ath6kl_irq_proc_registers irq_proc_reg; |
70 | u8 pad2[A_CACHE_LINE_PAD]; | ||
71 | struct ath6kl_irq_enable_reg irq_en_reg; | 56 | struct ath6kl_irq_enable_reg irq_en_reg; |
72 | u8 pad3[A_CACHE_LINE_PAD]; | ||
73 | struct htc_target *htc_cnxt; | 57 | struct htc_target *htc_cnxt; |
74 | struct ath6kl *ar; | 58 | struct ath6kl *ar; |
75 | }; | 59 | }; |