Commit 42a03e98 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

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: default avatarAlan Cox <alan@linux.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d97aabcd
...@@ -198,20 +198,10 @@ typedef struct _GLOBAL_t { /* Location: */ ...@@ -198,20 +198,10 @@ typedef struct _GLOBAL_t { /* Location: */
/* /*
* structure for txdma packet ring number of descriptor reg in txdma address * structure for txdma packet ring number of descriptor reg in txdma address
* map. Located at address 0x100C * 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_MASK 0x3FF /* 10 bit mask for DMA10W types */
#define ET_DMA10_WRAP 0x400 #define ET_DMA10_WRAP 0x400
...@@ -261,7 +251,7 @@ typedef struct _TXDMA_t { /* Location: */ ...@@ -261,7 +251,7 @@ typedef struct _TXDMA_t { /* Location: */
u32 csr; /* 0x1000 */ u32 csr; /* 0x1000 */
u32 pr_base_hi; /* 0x1004 */ u32 pr_base_hi; /* 0x1004 */
u32 pr_base_lo; /* 0x1008 */ 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; /* 0x1010 */
u32 txq_wr_addr_ext; /* 0x1014 */ u32 txq_wr_addr_ext; /* 0x1014 */
u32 txq_rd_addr; /* 0x1018 */ u32 txq_rd_addr; /* 0x1018 */
......
...@@ -209,7 +209,7 @@ void ConfigTxDmaRegs(struct et131x_adapter *etdev) ...@@ -209,7 +209,7 @@ void ConfigTxDmaRegs(struct et131x_adapter *etdev)
&txdma->pr_base_lo); &txdma->pr_base_lo);
/* Initialise the transmit DMA engine */ /* 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 */ /* Load the completion writeback physical address */
writel((u32)((u64)etdev->tx_ring.tx_status_pa >> 32), writel((u32)((u64)etdev->tx_ring.tx_status_pa >> 32),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment