From ed8239c17e0d30d93d94494d9c08efa0b369d23d Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 5 Oct 2011 12:23:42 +0300 Subject: [PATCH] --- yaml --- r: 278015 b: refs/heads/master c: 533cbbb686684dcf9915e5890df29f5cca05d173 h: refs/heads/master i: 278013: a429c0afae51e4b386caecb0091603cf8c027730 278011: 032de976ac7c8d514cd1e4ab8cf5d59b81ca694e 278007: 2eb80d865c80216e36a3d2185650167b99d88a49 277999: ded7090a13cc40a62a88b8a22ec04d314806dccc 277983: c87c7c686cd329342dc496451fc31054f1e38c5e 277951: 912bb3e6d9ef2fe15cb23712e9d113d99e8a8c95 277887: 64ff422a7588ef375fb089be2de1c07a48ede103 277759: fc39efcb18cbec5b99728e8beff4508b58d47726 277503: 3d6add57f2c8a23818d70a1d170e3506250746f9 v: v3 --- [refs] | 2 +- .../drivers/net/wireless/ath/ath6kl/htc_hif.h | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index bc29fac5bcc7..032e472ed87a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e8ddb2b8d19a952e1dff7a2a8a9d606e52fc3e3 +refs/heads/master: 533cbbb686684dcf9915e5890df29f5cca05d173 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.h b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.h index 5572c23b46f1..a8a6de552162 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.h +++ b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.h @@ -20,29 +20,16 @@ #include "htc.h" #include "hif.h" -#define ATH6KL_MAILBOXES 4 - /* HTC runs over mailbox 0 */ #define HTC_MAILBOX 0 #define ATH6KL_TARGET_DEBUG_INTR_MASK 0x01 -#define OTHER_INTS_ENABLED (INT_STATUS_ENABLE_ERROR_MASK | \ - INT_STATUS_ENABLE_CPU_MASK | \ - INT_STATUS_ENABLE_COUNTER_MASK) - -#define ATH6KL_REG_IO_BUFFER_SIZE 32 -#define ATH6KL_MAX_REG_IO_BUFFERS 8 +/* FIXME: are these duplicates with MAX_SCATTER_ values in hif.h? */ #define ATH6KL_SCATTER_ENTRIES_PER_REQ 16 #define ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER (16 * 1024) #define ATH6KL_SCATTER_REQS 4 -#ifndef A_CACHE_LINE_PAD -#define A_CACHE_LINE_PAD 128 -#endif -#define ATH6KL_MIN_SCATTER_ENTRIES_PER_REQ 2 -#define ATH6KL_MIN_TRANSFER_SIZE_PER_SCATTER (4 * 1024) - struct ath6kl_irq_proc_registers { u8 host_int_status; u8 cpu_int_status; @@ -65,11 +52,8 @@ struct ath6kl_irq_enable_reg { struct ath6kl_device { spinlock_t lock; - u8 pad1[A_CACHE_LINE_PAD]; struct ath6kl_irq_proc_registers irq_proc_reg; - u8 pad2[A_CACHE_LINE_PAD]; struct ath6kl_irq_enable_reg irq_en_reg; - u8 pad3[A_CACHE_LINE_PAD]; struct htc_target *htc_cnxt; struct ath6kl *ar; };