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>

diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index 95fb22e42ed5de50912b0072068ca41aa1bab2d3..c447e9a3ed929b9ea909ec9dc53b4eaef3c9f725 100644 (file)
--- 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 */

diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index 4c4555dffd1ff6c5e3f3a0b40629d49eff680a20..48f1ffc3df6aa8a7fd0daffa2395f8ac40999faf 100644 (file)
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -695,7 +695,7 @@ void ConfigRxDmaRegs(struct et131x_adapter *etdev)
         * regardless of whether we have received packets.
         * This value gets updated once autoneg is complete.
         */
-       writel(PARM_RX_TIME_INT_DEF, &rx_dma->max_pkt_time.value);
+       writel(PARM_RX_TIME_INT_DEF, &rx_dma->max_pkt_time);
 
        spin_unlock_irqrestore(&etdev->RcvLock, flags);
 }
@@ -711,7 +711,7 @@ void SetRxDmaTimer(struct et131x_adapter *etdev)
         */
        if ((etdev->linkspeed == TRUEPHY_SPEED_100MBPS) ||
            (etdev->linkspeed == TRUEPHY_SPEED_10MBPS)) {
-               writel(0, &etdev->regs->rxdma.max_pkt_time.value);
+               writel(0, &etdev->regs->rxdma.max_pkt_time);
                writel(1, &etdev->regs->rxdma.num_pkt_done.value);
        }
 }