Skip to content

Commit

Permalink
Staging: et131x: kill txmac err count typedef
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 6720949 commit 1cb180d
Showing 1 changed file with 6 additions and 17 deletions.
23 changes: 6 additions & 17 deletions drivers/staging/et131x/et1310_address_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -563,23 +563,12 @@ struct rxdma_regs { /* Location: */
/*
* structure for error count reg in txmac address map
* located at address 0x3008
*
* 31-12: unused
* 11-8: reserved
* 7-4: txq_underrun
* 3-0: fifo_underrun
*/
typedef union _TXMAC_ERR_CNT_t {
u32 value;
struct {
#ifdef _BIT_FIELDS_HTOL
u32 unused:20; /* bits 12-31 */
u32 reserved:4; /* bits 8-11 */
u32 txq_underrun:4; /* bits 4-7 */
u32 fifo_underrun:4; /* bits 0-3 */
#else
u32 fifo_underrun:4; /* bits 0-3 */
u32 txq_underrun:4; /* bits 4-7 */
u32 reserved:4; /* bits 8-11 */
u32 unused:20; /* bits 12-31 */
#endif
} bits;
} TXMAC_ERR_CNT_t, *PTXMAC_ERR_CNT_t;

/*
* structure for max fill reg in txmac address map
Expand Down Expand Up @@ -682,7 +671,7 @@ typedef union _TXMAC_ERR_INT_t {
typedef struct _TXMAC_t { /* Location: */
u32 ctl; /* 0x3000 */
u32 shadow_ptr; /* 0x3004 */
TXMAC_ERR_CNT_t err_cnt; /* 0x3008 */
u32 err_cnt; /* 0x3008 */
u32 max_fill; /* 0x300C */
u32 cf_param; /* 0x3010 */
u32 tx_test; /* 0x3014 */
Expand Down

0 comments on commit 1cb180d

Please sign in to comment.