staging: et131x: Remove typedefs from et1310_phy.h

Fixes the associated checkpatch warnings.
Tested with ifconfig/general use of a device (Agere Systems ET-131x PCI-E
Ethernet Controller (rev 02)).

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/et131x/et1310_phy.c

@@ -582,7 +582,7 @@ static void et131x_xcvr_init(struct et131x_adapter *etdev)
 	u16 lcr2;
 
 	/* Zero out the adapter structure variable representing BMSR */
-	etdev->Bmsr.value = 0;
+	etdev->bmsr = 0;
 
 	MiRead(etdev, (u8) offsetof(struct mi_regs, isr), &isr);
 	MiRead(etdev, (u8) offsetof(struct mi_regs, imr), &imr);
@@ -729,7 +729,7 @@ static void et131x_xcvr_init(struct et131x_adapter *etdev)
 }
 
 void et131x_Mii_check(struct et131x_adapter *etdev,
-		      MI_BMSR_t bmsr, MI_BMSR_t bmsr_ints)
+		      u16 bmsr, u16 bmsr_ints)
 {
 	u8 link_status;
 	u32 autoneg_status;
@@ -740,8 +740,8 @@ void et131x_Mii_check(struct et131x_adapter *etdev,
 	u32 polarity;
 	unsigned long flags;
 
-	if (bmsr_ints.bits.link_status) {
+	if (bmsr_ints & MI_BMSR_LINK_STATUS) {
-		if (bmsr.bits.link_status) {
+		if (bmsr & MI_BMSR_LINK_STATUS) {
 			etdev->boot_coma = 20;
 
 			/* Update our state variables and indicate the
@@ -820,9 +820,10 @@ void et131x_Mii_check(struct et131x_adapter *etdev,
 		}
 	}
 
-	if (bmsr_ints.bits.auto_neg_complete ||
+	if ((bmsr_ints & MI_BMSR_AUTO_NEG_COMPLETE) ||
-	    (etdev->AiForceDpx == 3 && bmsr_ints.bits.link_status)) {
+	    (etdev->AiForceDpx == 3 && (bmsr_ints & MI_BMSR_LINK_STATUS))) {
-		if (bmsr.bits.auto_neg_complete || etdev->AiForceDpx == 3) {
+		if ((bmsr & MI_BMSR_AUTO_NEG_COMPLETE) ||
+		    etdev->AiForceDpx == 3) {
 			ET1310_PhyLinkStatus(etdev,
 					     &link_status, &autoneg_status,
 					     &speed, &duplex, &mdi_mdix,

drivers/staging/et131x/et1310_phy.h

@@ -126,119 +126,66 @@ struct mi_regs {
 	u8 mi_res4[3];	/* Future use by MI working group(Reg 0x1D - 0x1F) */
 };
 
-/* MI Register 0: Basic mode control register */
+/*
-typedef union _MI_BMCR_t {
+ * MI Register 0: Basic mode control register
-	u16 value;
+ *	15:	reset
-	struct {
+ *	14:	loopback
-#ifdef _BIT_FIELDS_HTOL
+ *	13:	speed_sel
-		u16 reset:1;		/* bit 15 */
+ *	12:	enable_autoneg
-		u16 loopback:1;		/* bit 14 */
+ *	11:	power_down
-		u16 speed_sel:1;		/* bit 13 */
+ *	10:	isolate
-		u16 enable_autoneg:1;	/* bit 12 */
+ *	9:	restart_autoneg
-		u16 power_down:1;		/* bit 11 */
+ *	8:	duplex_mode
-		u16 isolate:1;		/* bit 10 */
+ *	7:	col_test
-		u16 restart_autoneg:1;	/* bit 9 */
+ *	6:	speed_1000_sel
-		u16 duplex_mode:1;		/* bit 8 */
+ *	5-0:	res1
-		u16 col_test:1;		/* bit 7 */
+ */
-		u16 speed_1000_sel:1;	/* bit 6 */
-		u16 res1:6;		/* bits 0-5 */
-#else
-		u16 res1:6;		/* bits 0-5 */
-		u16 speed_1000_sel:1;	/* bit 6 */
-		u16 col_test:1;		/* bit 7 */
-		u16 duplex_mode:1;		/* bit 8 */
-		u16 restart_autoneg:1;	/* bit 9 */
-		u16 isolate:1;		/* bit 10 */
-		u16 power_down:1;		/* bit 11 */
-		u16 enable_autoneg:1;	/* bit 12 */
-		u16 speed_sel:1;		/* bit 13 */
-		u16 loopback:1;		/* bit 14 */
-		u16 reset:1;		/* bit 15 */
-#endif
-	} bits;
-} MI_BMCR_t, *PMI_BMCR_t;
 
-/* MI Register 1:  Basic mode status register */
+/*
-typedef union _MI_BMSR_t {
+ * MI Register 1:  Basic mode status register
-	u16 value;
+ *	15:	link_100T4
-	struct {
+ *	14:	link_100fdx
-#ifdef _BIT_FIELDS_HTOL
+ *	13:	link_100hdx
-		u16 link_100T4:1;		/* bit 15 */
+ *	12:	link_10fdx
-		u16 link_100fdx:1;		/* bit 14 */
+ *	11:	link_10hdx
-		u16 link_100hdx:1;		/* bit 13 */
+ *	10:	link_100T2fdx
-		u16 link_10fdx:1;		/* bit 12 */
+ *	9:	link_100T2hdx
-		u16 link_10hdx:1;		/* bit 11 */
+ *	8:	extend_status
-		u16 link_100T2fdx:1;	/* bit 10 */
+ *	7:	res1
-		u16 link_100T2hdx:1;	/* bit 9 */
+ *	6:	preamble_supress
-		u16 extend_status:1;	/* bit 8 */
+ *	5:	auto_neg_complete
-		u16 res1:1;		/* bit 7 */
+ *	4:	remote_fault
-		u16 preamble_supress:1;	/* bit 6 */
+ *	3:	auto_neg_able
-		u16 auto_neg_complete:1;	/* bit 5 */
+ *	2:	link_status
-		u16 remote_fault:1;	/* bit 4 */
+ *	1:	jabber_detect
-		u16 auto_neg_able:1;	/* bit 3 */
+ *	0:	ext_cap
-		u16 link_status:1;		/* bit 2 */
+ */
-		u16 jabber_detect:1;	/* bit 1 */
-		u16 ext_cap:1;		/* bit 0 */
-#else
-		u16 ext_cap:1;		/* bit 0 */
-		u16 jabber_detect:1;	/* bit 1 */
-		u16 link_status:1;		/* bit 2 */
-		u16 auto_neg_able:1;	/* bit 3 */
-		u16 remote_fault:1;	/* bit 4 */
-		u16 auto_neg_complete:1;	/* bit 5 */
-		u16 preamble_supress:1;	/* bit 6 */
-		u16 res1:1;		/* bit 7 */
-		u16 extend_status:1;	/* bit 8 */
-		u16 link_100T2hdx:1;	/* bit 9 */
-		u16 link_100T2fdx:1;	/* bit 10 */
-		u16 link_10hdx:1;		/* bit 11 */
-		u16 link_10fdx:1;		/* bit 12 */
-		u16 link_100hdx:1;		/* bit 13 */
-		u16 link_100fdx:1;		/* bit 14 */
-		u16 link_100T4:1;		/* bit 15 */
-#endif
-	} bits;
-} MI_BMSR_t, *PMI_BMSR_t;
 
-/* MI Register 4: Auto-negotiation advertisement register */
+#define MI_BMSR_LINK_STATUS	  0x04
-typedef union _MI_ANAR_t {
+#define MI_BMSR_AUTO_NEG_COMPLETE 0x20
-	u16 value;
+
-	struct {
+/*
-#ifdef _BIT_FIELDS_HTOL
+ * MI Register 4: Auto-negotiation advertisement register
-		u16 np_indication:1;	/* bit 15 */
+ *
-		u16 res2:1;		/* bit 14 */
+ *	15:	np_indication
-		u16 remote_fault:1;	/* bit 13 */
+ *	14:	res2
-		u16 res1:1;		/* bit 12 */
+ *	13:	remote_fault
-		u16 cap_asmpause:1;	/* bit 11 */
+ *	12:	res1
-		u16 cap_pause:1;		/* bit 10 */
+ *	11:	cap_asmpause
-		u16 cap_100T4:1;		/* bit 9 */
+ *	10:	cap_pause
-		u16 cap_100fdx:1;		/* bit 8 */
+ *	9:	cap_100T4
-		u16 cap_100hdx:1;		/* bit 7 */
+ *	8:	cap_100fdx
-		u16 cap_10fdx:1;		/* bit 6 */
+ *	7:	cap_100hdx
-		u16 cap_10hdx:1;		/* bit 5 */
+ *	6:	cap_10fdx
-		u16 selector:5;		/* bits 0-4 */
+ *	5:	cap_10hdx
-#else
+ *	4-0:	selector
-		u16 selector:5;		/* bits 0-4 */
+ */
-		u16 cap_10hdx:1;		/* bit 5 */
-		u16 cap_10fdx:1;		/* bit 6 */
-		u16 cap_100hdx:1;		/* bit 7 */
-		u16 cap_100fdx:1;		/* bit 8 */
-		u16 cap_100T4:1;		/* bit 9 */
-		u16 cap_pause:1;		/* bit 10 */
-		u16 cap_asmpause:1;	/* bit 11 */
-		u16 res1:1;		/* bit 12 */
-		u16 remote_fault:1;	/* bit 13 */
-		u16 res2:1;		/* bit 14 */
-		u16 np_indication:1;	/* bit 15 */
-#endif
-	} bits;
-} MI_ANAR_t, *PMI_ANAR_t;
 
 /* MI Register 5: Auto-negotiation link partner advertisement register
  *	15:	np_indication
  *	14:	acknowledge
  *	13:	remote_fault
- *	12:	res1:1;		
+ *	12:	res1
  *	11:	cap_asmpause
  *	10:	cap_pause
  *	9:	cap_100T4
@@ -258,7 +205,7 @@ typedef union _MI_ANAR_t {
  *	0:	lp_an_able
  */
 
-/* MI Register 7: Auto-negotiation next page transmit reg(0x07) 
+/* MI Register 7: Auto-negotiation next page transmit reg(0x07)
  *	15:	np
  *	14:	reserved
  *	13:	msg_page
@@ -267,7 +214,7 @@ typedef union _MI_ANAR_t {
  *	10-0	msg
  */
 
-/* MI Register 8: Link Partner Next Page Reg(0x08) 
+/* MI Register 8: Link Partner Next Page Reg(0x08)
  *	15:	np
  *	14:	ack
  *	13:	msg_page
@@ -473,7 +420,7 @@ typedef union _MI_ANAR_t {
 #define TRUEPHY_ADV_DUPLEX_FULL         0x01
 #define TRUEPHY_ADV_DUPLEX_HALF         0x02
 #define TRUEPHY_ADV_DUPLEX_BOTH     \
-    (TRUEPHY_ADV_DUPLEX_FULL | TRUEPHY_ADV_DUPLEX_HALF)
+	(TRUEPHY_ADV_DUPLEX_FULL | TRUEPHY_ADV_DUPLEX_HALF)
 
 #define PHY_CONTROL                0x00	/* #define TRU_MI_CONTROL_REGISTER                 0 */
 #define PHY_STATUS                 0x01	/* #define TRU_MI_STATUS_REGISTER                  1 */

drivers/staging/et131x/et131x.h

@@ -113,7 +113,7 @@ int PhyMiRead(struct et131x_adapter *adapter, u8 xcvrAddr,
 int32_t MiWrite(struct et131x_adapter *adapter,
 		u8 xcvReg, u16 value);
 void et131x_Mii_check(struct et131x_adapter *pAdapter,
-		      MI_BMSR_t bmsr, MI_BMSR_t bmsr_ints);
+		      u16 bmsr, u16 bmsr_ints);
 
 /* This last is not strictly required (the driver could call the TPAL
  * version instead), but this sets the adapter up correctly, and calls the

drivers/staging/et131x/et131x_adapter.h

@@ -222,7 +222,7 @@ struct et131x_adapter {
 	u32 CachedMaskValue;
 
 	/* Xcvr status at last poll */
-	MI_BMSR_t Bmsr;
+	u16 bmsr;
 
 	/* Tx Memory Variables */
 	struct tx_ring tx_ring;

drivers/staging/et131x/et131x_initpci.c

@@ -274,14 +274,14 @@ void et131x_error_timer_handler(unsigned long data)
 		dev_err(&etdev->pdev->dev,
 		    "No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr);
 
-	if (!etdev->Bmsr.bits.link_status &&
+	if (!(etdev->bmsr & MI_BMSR_LINK_STATUS) &&
 	    etdev->RegistryPhyComa &&
 	    etdev->boot_coma < 11) {
 		etdev->boot_coma++;
 	}
 
 	if (etdev->boot_coma == 10) {
-		if (!etdev->Bmsr.bits.link_status
+		if (!(etdev->bmsr & MI_BMSR_LINK_STATUS)
 		    && etdev->RegistryPhyComa) {
 			if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) {
 				/* NOTE - This was originally a 'sync with

drivers/staging/et131x/et131x_isr.c

@@ -365,7 +365,8 @@ void et131x_isr_handler(struct work_struct *work)
 		/* Handle the PHY interrupt */
 		if (status & ET_INTR_PHY) {
 			u32 pm_csr;
-			MI_BMSR_t BmsrInts, BmsrData;
+			u16 bmsr_ints;
+			u16 bmsr_data;
 			u16 myisr;
 
 			/* If we are in coma mode when we get this interrupt,
@@ -390,14 +391,13 @@ void et131x_isr_handler(struct work_struct *work)
 			if (!etdev->ReplicaPhyLoopbk) {
 				MiRead(etdev,
 				       (uint8_t) offsetof(struct mi_regs, bmsr),
-				       &BmsrData.value);
+				       &bmsr_data);
 
-				BmsrInts.value =
+				bmsr_ints = etdev->bmsr ^ bmsr_data;
-				    etdev->Bmsr.value ^ BmsrData.value;
+				etdev->bmsr = bmsr_data;
-				etdev->Bmsr.value = BmsrData.value;
 
 				/* Do all the cable in / cable out stuff */
-				et131x_Mii_check(etdev, BmsrData, BmsrInts);
+				et131x_Mii_check(etdev, bmsr_data, bmsr_ints);
 			}
 		}