Staging: et131x: Clean up the MII_MGMT type

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 3ef4260b4f73370bacd2c27437567723046ead13..423030f1df827236d13ee1dd0672664dacbb6758 100644 (file)
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -1452,27 +1452,14 @@ typedef union _MAC_TEST_t {
 /*
  * structure for MII Management Configuration reg in mac address map.
  * located at address 0x5020
+ *
+ * 31: reset MII mgmt
+ * 30-6: unused
+ * 5: scan auto increment
+ * 4: preamble supress
+ * 3: undefined
+ * 2-0: mgmt clock reset
  */
-typedef union _MII_MGMT_CFG_t {
-       u32 value;
-       struct {
-#ifdef _BIT_FIELDS_HTOL
-               u32 reset_mii_mgmt:1;   /* bit 31 */
-               u32 reserved:25;                /* bits 6-30 */
-               u32 scan_auto_incremt:1;        /* bit 5 */
-               u32 preamble_suppress:1;        /* bit 4 */
-               u32 undefined:1;                /* bit 3 */
-               u32 mgmt_clk_reset:3;   /* bits 0-2 */
-#else
-               u32 mgmt_clk_reset:3;   /* bits 0-2 */
-               u32 undefined:1;                /* bit 3 */
-               u32 preamble_suppress:1;        /* bit 4 */
-               u32 scan_auto_incremt:1;        /* bit 5 */
-               u32 reserved:25;                /* bits 6-30 */
-               u32 reset_mii_mgmt:1;   /* bit 31 */
-#endif
-       } bits;
-} MII_MGMT_CFG_t, *PMII_MGMT_CFG_t;
 
 /*
  * structure for MII Management Command reg in mac address map.
@@ -1703,7 +1690,7 @@ typedef struct _MAC_t {                                   /* Location: */
        u32 rsv1;                                       /*  0x5014 */
        u32 rsv2;                                       /*  0x5018 */
        MAC_TEST_t mac_test;                            /*  0x501C */
-       MII_MGMT_CFG_t mii_mgmt_cfg;                    /*  0x5020 */
+       u32 mii_mgmt_cfg;                               /*  0x5020 */
        MII_MGMT_CMD_t mii_mgmt_cmd;                    /*  0x5024 */
        MII_MGMT_ADDR_t mii_mgmt_addr;                  /*  0x5028 */
        MII_MGMT_CTRL_t mii_mgmt_ctrl;                  /*  0x502C */

diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c
index 7ac8209a686b52fb85a85e70852abe51c5ff3690..712a49ed410f5f521d86765b92c5a09aeeb0dbfe 100644 (file)
--- a/drivers/staging/et131x/et1310_mac.c
+++ b/drivers/staging/et131x/et1310_mac.c
@@ -102,7 +102,6 @@ void ConfigMACRegs1(struct et131x_adapter *etdev)
        MAC_STATION_ADDR1_t station1;
        MAC_STATION_ADDR2_t station2;
        u32 ipg;
-       MII_MGMT_CFG_t mii_mgmt_cfg;
 
        /* First we need to reset everything.  Write to MAC configuration
         * register 1 to perform reset.
@@ -122,11 +121,7 @@ void ConfigMACRegs1(struct et131x_adapter *etdev)
        writel(0, &pMac->if_ctrl.value);
 
        /* Let's move on to setting up the mii management configuration */
-       mii_mgmt_cfg.bits.reset_mii_mgmt = 0;
-       mii_mgmt_cfg.bits.scan_auto_incremt = 0;
-       mii_mgmt_cfg.bits.preamble_suppress = 0;
-       mii_mgmt_cfg.bits.mgmt_clk_reset = 0x7;
-       writel(mii_mgmt_cfg.value, &pMac->mii_mgmt_cfg.value);
+       writel(0x07, &pMac->mii_mgmt_cfg);      /* Clock reset 0x7 */
 
        /* Next lets configure the MAC Station Address register.  These
         * values are read from the EEPROM during initialization and stored