diff options
| author | Alan Cox | 2009-11-18 15:07:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-12-11 21:23:21 +0100 |
| commit | 42a03e98d1a691bb66bd9fde021aa9c95bce1cd6 (patch) | |
| tree | ad3838db211c044dd5da7fc5397a0ade910686cd /drivers/staging/et131x | |
| parent | Staging: et131x: kill TxMacTest field (diff) | |
| download | kernel-qcow2-linux-42a03e98d1a691bb66bd9fde021aa9c95bce1cd6.tar.gz kernel-qcow2-linux-42a03e98d1a691bb66bd9fde021aa9c95bce1cd6.tar.xz kernel-qcow2-linux-42a03e98d1a691bb66bd9fde021aa9c95bce1cd6.zip | |
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>
Diffstat (limited to 'drivers/staging/et131x')
| -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: */ /* * structure for txdma packet ring number of descriptor reg in txdma address * map. Located at address 0x100C + * + * 31-10: unused + * 9-0: pr ndes */ -typedef union _TXDMA_PR_NUM_DES_t { - u32 value; - struct { -#ifdef _BIT_FIELDS_HTOL - u32 unused:22; /* bits 10-31 */ - u32 pr_ndes:10; /* bits 0-9 */ -#else - u32 pr_ndes:10; /* bits 0-9 */ - u32 unused:22; /* bits 10-31 */ -#endif - } bits; -} TXDMA_PR_NUM_DES_t, *PTXDMA_PR_NUM_DES_t; - #define ET_DMA10_MASK 0x3FF /* 10 bit mask for DMA10W types */ #define ET_DMA10_WRAP 0x400 @@ -261,7 +251,7 @@ typedef struct _TXDMA_t { /* Location: */ u32 csr; /* 0x1000 */ u32 pr_base_hi; /* 0x1004 */ u32 pr_base_lo; /* 0x1008 */ - TXDMA_PR_NUM_DES_t pr_num_des; /* 0x100C */ + u32 pr_num_des; /* 0x100C */ u32 txq_wr_addr; /* 0x1010 */ u32 txq_wr_addr_ext; /* 0x1014 */ 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) &txdma->pr_base_lo); /* Initialise the transmit DMA engine */ - writel(NUM_DESC_PER_RING_TX - 1, &txdma->pr_num_des.value); + writel(NUM_DESC_PER_RING_TX - 1, &txdma->pr_num_des); /* Load the completion writeback physical address */ writel((u32)((u64)etdev->tx_ring.tx_status_pa >> 32), |