summaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x/et1310_address_map.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-11-18 14:07:41 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:21 -0800
commit6794712519265bb64aa20fe61f4da36bf8adbded (patch)
tree9f02b1d1d4206968422795b8725093403f112ad2 /drivers/staging/et131x/et1310_address_map.h
parent02cdb0b427486355b9b8d715e529cff5b7b7b0e8 (diff)
downloadop-kernel-dev-6794712519265bb64aa20fe61f4da36bf8adbded.zip
op-kernel-dev-6794712519265bb64aa20fe61f4da36bf8adbded.tar.gz
Staging: et131x: kill RX_DMA_MAX_PKT_TIME
Another one bits the dust ... Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_address_map.h')
-rw-r--r--drivers/staging/et131x/et1310_address_map.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index 95fb22e..c447e9a 100644
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -356,19 +356,10 @@ typedef union _RXDMA_NUM_PKT_DONE_t {
/*
* structure for max packet time reg in rxdma address map
* located at address 0x2010
+ *
+ * 31-18: unused
+ * 17-0: time done
*/
-typedef union _RXDMA_MAX_PKT_TIME_t {
- u32 value;
- struct {
-#ifdef _BIT_FIELDS_HTOL
- u32 unused:14; /* bits 18-31 */
- u32 time_done:18; /* bits 0-17 */
-#else
- u32 time_done:18; /* bits 0-17 */
- u32 unused:14; /* bits 18-31 */
-#endif
- } bits;
-} RXDMA_MAX_PKT_TIME_t, *PRXDMA_MAX_PKT_TIME_t;
/*
* structure for rx queue read address reg in rxdma address map
@@ -609,7 +600,7 @@ typedef struct _RXDMA_t { /* Location: */
u32 dma_wb_base_lo; /* 0x2004 */
u32 dma_wb_base_hi; /* 0x2008 */
RXDMA_NUM_PKT_DONE_t num_pkt_done; /* 0x200C */
- RXDMA_MAX_PKT_TIME_t max_pkt_time; /* 0x2010 */
+ u32 max_pkt_time; /* 0x2010 */
u32 rxq_rd_addr; /* 0x2014 */
u32 rxq_rd_addr_ext; /* 0x2018 */
u32 rxq_wr_addr; /* 0x201C */
OpenPOWER on IntegriCloud