diff options
author | Alan Cox <alan@linux.intel.com> | 2009-11-18 09:07:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:21 -0500 |
commit | 42a03e98d1a691bb66bd9fde021aa9c95bce1cd6 (patch) | |
tree | ad3838db211c044dd5da7fc5397a0ade910686cd | |
parent | d97aabcd0ea6dd3375747b1e02b9164c4064880d (diff) |
Staging: et131x: kill TX_PR_NUM_DES_t
Yes folks it another unused typedef.. This completes the clean up of the
TX DMA typedefs
Signed-off-by: Alan Cox <alan@linux.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/et131x/et1310_address_map.h | 18 | ||||
-rw-r--r-- | drivers/staging/et131x/et1310_tx.c | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index 9fa8628f81f5..8b514a0acc1c 100644 --- a/drivers/staging/et131x/et1310_address_map.h +++ b/drivers/staging/et131x/et1310_address_map.h | |||
@@ -198,20 +198,10 @@ typedef struct _GLOBAL_t { /* Location: */ | |||
198 | /* | 198 | /* |
199 | * structure for txdma packet ring number of descriptor reg in txdma address | 199 | * structure for txdma packet ring number of descriptor reg in txdma address |
200 | * map. Located at address 0x100C | 200 | * map. Located at address 0x100C |
201 | * | ||
202 | * 31-10: unused | ||
203 | * 9-0: pr ndes | ||
201 | */ | 204 | */ |
202 | typedef union _TXDMA_PR_NUM_DES_t { | ||
203 | u32 value; | ||
204 | struct { | ||
205 | #ifdef _BIT_FIELDS_HTOL | ||
206 | u32 unused:22; /* bits 10-31 */ | ||
207 | u32 pr_ndes:10; /* bits 0-9 */ | ||
208 | #else | ||
209 | u32 pr_ndes:10; /* bits 0-9 */ | ||
210 | u32 unused:22; /* bits 10-31 */ | ||
211 | #endif | ||
212 | } bits; | ||
213 | } TXDMA_PR_NUM_DES_t, *PTXDMA_PR_NUM_DES_t; | ||
214 | |||
215 | 205 | ||
216 | #define ET_DMA10_MASK 0x3FF /* 10 bit mask for DMA10W types */ | 206 | #define ET_DMA10_MASK 0x3FF /* 10 bit mask for DMA10W types */ |
217 | #define ET_DMA10_WRAP 0x400 | 207 | #define ET_DMA10_WRAP 0x400 |
@@ -261,7 +251,7 @@ typedef struct _TXDMA_t { /* Location: */ | |||
261 | u32 csr; /* 0x1000 */ | 251 | u32 csr; /* 0x1000 */ |
262 | u32 pr_base_hi; /* 0x1004 */ | 252 | u32 pr_base_hi; /* 0x1004 */ |
263 | u32 pr_base_lo; /* 0x1008 */ | 253 | u32 pr_base_lo; /* 0x1008 */ |
264 | TXDMA_PR_NUM_DES_t pr_num_des; /* 0x100C */ | 254 | u32 pr_num_des; /* 0x100C */ |
265 | u32 txq_wr_addr; /* 0x1010 */ | 255 | u32 txq_wr_addr; /* 0x1010 */ |
266 | u32 txq_wr_addr_ext; /* 0x1014 */ | 256 | u32 txq_wr_addr_ext; /* 0x1014 */ |
267 | u32 txq_rd_addr; /* 0x1018 */ | 257 | u32 txq_rd_addr; /* 0x1018 */ |
diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c index d0c71db6c57c..977e8b34e7a6 100644 --- a/drivers/staging/et131x/et1310_tx.c +++ b/drivers/staging/et131x/et1310_tx.c | |||
@@ -209,7 +209,7 @@ void ConfigTxDmaRegs(struct et131x_adapter *etdev) | |||
209 | &txdma->pr_base_lo); | 209 | &txdma->pr_base_lo); |
210 | 210 | ||
211 | /* Initialise the transmit DMA engine */ | 211 | /* Initialise the transmit DMA engine */ |
212 | writel(NUM_DESC_PER_RING_TX - 1, &txdma->pr_num_des.value); | 212 | writel(NUM_DESC_PER_RING_TX - 1, &txdma->pr_num_des); |
213 | 213 | ||
214 | /* Load the completion writeback physical address */ | 214 | /* Load the completion writeback physical address */ |
215 | writel((u32)((u64)etdev->tx_ring.tx_status_pa >> 32), | 215 | writel((u32)((u64)etdev->tx_ring.tx_status_pa >> 32), |