Staging: et13x: kill off TXMAC_ERR_INT_t

This completes the structures within the txmac block so we can now
propogate a name change and type removal up a layer and clean up TXMAC as
well

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 4c1e735..d599f31 100644 (file)
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -612,33 +612,17 @@ struct rxdma_regs {                                       /* Location: */
 /*
  * structure for error interrupt reg in txmac address map
  * located at address 0x301C
+ *
+ * 31-9: unused
+ * 8: fifo_underrun
+ * 7-6: unused
+ * 5: ctrl2_err
+ * 4: txq_underrun
+ * 3: bcnt_err
+ * 2: lseg_err
+ * 1: segnum_err
+ * 0: seg0_err
  */
-typedef union _TXMAC_ERR_INT_t {
-       u32 value;
-       struct {
-#ifdef _BIT_FIELDS_HTOL
-               u32 unused2:23;         /* bits 9-31 */
-               u32 fifo_underrun:1;    /* bit 8 */
-               u32 unused1:2;          /* bits 6-7 */
-               u32 ctrl2_err:1;        /* bit 5 */
-               u32 txq_underrun:1;     /* bit 4 */
-               u32 bcnt_err:1;         /* bit 3 */
-               u32 lseg_err:1;         /* bit 2 */
-               u32 segnum_err:1;       /* bit 1 */
-               u32 seg0_err:1;         /* bit 0 */
-#else
-               u32 seg0_err:1;         /* bit 0 */
-               u32 segnum_err:1;       /* bit 1 */
-               u32 lseg_err:1;         /* bit 2 */
-               u32 bcnt_err:1;         /* bit 3 */
-               u32 txq_underrun:1;     /* bit 4 */
-               u32 ctrl2_err:1;        /* bit 5 */
-               u32 unused1:2;          /* bits 6-7 */
-               u32 fifo_underrun:1;    /* bit 8 */
-               u32 unused2:23;         /* bits 9-31 */
-#endif
-       } bits;
-} TXMAC_ERR_INT_t, *PTXMAC_ERR_INT_t;
 
 /*
  * structure for error interrupt reg in txmac address map
@@ -652,7 +636,7 @@ typedef union _TXMAC_ERR_INT_t {
 /*
  * Tx MAC Module of JAGCore Address Mapping
  */
-typedef struct _TXMAC_t {              /* Location: */
+struct txmac_regs {                    /* Location: */
        u32 ctl;                        /*  0x3000 */
        u32 shadow_ptr;                 /*  0x3004 */
        u32 err_cnt;                    /*  0x3008 */
@@ -660,9 +644,9 @@ typedef struct _TXMAC_t {           /* Location: */
        u32 cf_param;                   /*  0x3010 */
        u32 tx_test;                    /*  0x3014 */
        u32 err;                        /*  0x3018 */
-       TXMAC_ERR_INT_t err_int;        /*  0x301C */
+       u32 err_int;                    /*  0x301C */
        u32 bp_ctrl;                    /*  0x3020 */
-} TXMAC_t, *PTXMAC_t;
+};
 
 /* END OF TXMAC REGISTER ADDRESS MAP */
 
@@ -1087,7 +1071,7 @@ typedef struct _RXMAC_t {                         /* Location: */
        RXMAC_ERROR_REG_t err_reg;                      /*  0x409C */
 } RXMAC_t, *PRXMAC_t;
 
-/* END OF TXMAC REGISTER ADDRESS MAP */
+/* END OF RXMAC REGISTER ADDRESS MAP */
 
 
 /* START OF MAC REGISTER ADDRESS MAP */
@@ -1632,9 +1616,9 @@ typedef struct _ADDRESS_MAP_t {
        struct rxdma_regs rxdma;
        /* unused section of rxdma address map */
        u8 unused_rxdma[4096 - sizeof(struct rxdma_regs)];
-       TXMAC_t txmac;
+       struct txmac_regs txmac;
        /* unused section of txmac address map */
-       u8 unused_txmac[4096 - sizeof(TXMAC_t)];
+       u8 unused_txmac[4096 - sizeof(struct txmac_regs)];
        RXMAC_t rxmac;
        /* unused section of rxmac address map */
        u8 unused_rxmac[4096 - sizeof(RXMAC_t)];

diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c
index dc9cb29..99aeb33 100644 (file)
--- a/drivers/staging/et131x/et1310_mac.c
+++ b/drivers/staging/et131x/et1310_mac.c
@@ -376,16 +376,16 @@ void ConfigRxMacRegs(struct et131x_adapter *etdev)
 
 void ConfigTxMacRegs(struct et131x_adapter *etdev)
 {
-       struct _TXMAC_t __iomem *pTxMac = &etdev->regs->txmac;
+       struct txmac_regs *txmac = &etdev->regs->txmac;
 
        /* We need to update the Control Frame Parameters
         * cfpt - control frame pause timer set to 64 (0x40)
         * cfep - control frame extended pause timer set to 0x0
         */
        if (etdev->FlowControl == None)
-               writel(0, &pTxMac->cf_param);
+               writel(0, &txmac->cf_param);
        else
-               writel(0x40, &pTxMac->cf_param);
+               writel(0x40, &txmac->cf_param);
 }
 
 void ConfigMacStatRegs(struct et131x_adapter *etdev)