---

yaml --- r: 268268 b: refs/heads/master c: e296396 h: refs/heads/master v: v3
git-mirror · Sep 6, 2011 · 62cc26b · 62cc26b
1 parent cbe0ce8
commit 62cc26b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06530d81d6a6b9cccd6433868fc0bb68fe0361e3
+refs/heads/master: e2963962aec7e953063c6a1e031a64ca9f5fd47b
diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c
@@ -496,12 +496,6 @@ void et131x_mii_check(struct et131x_adapter *adapter,
 
 			/* Setup ET1310 as per the documentation */
 			et131x_adapter_setup(adapter);
-
-			/* Setup the PHY into coma mode until the cable is
-			 * plugged back in
-			 */
-			if (adapter->registry_phy_coma == 1)
-				et1310_enable_phy_coma(adapter);
 		}
 	}
 

diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h
@@ -178,9 +178,7 @@ struct et131x_adapter {
 	struct address_map __iomem *regs;
 
 	/* Registry parameters */
-	u8 speed_duplex;	/* speed/duplex */
 	u8 wanted_flow;		/* Flow we want for 802.3x flow control */
-	u8 registry_phy_coma;	/* Phy Coma mode enable/disable */
 
 	u32 registry_rx_mem_end;	/* Size of internal rx memory */
 	u32 registry_jumbo_packet;	/* Max supported ethernet packet size */

diff --git a/trunk/drivers/staging/et131x/et131x_initpci.c b/trunk/drivers/staging/et131x/et131x_initpci.c
@@ -250,14 +250,12 @@ void et131x_error_timer_handler(unsigned long data)
 		    "No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr);
 
 	if (!(adapter->bmsr & BMSR_LSTATUS) &&
-	    adapter->registry_phy_coma &&
 	    adapter->boot_coma < 11) {
 		adapter->boot_coma++;
 	}
 
 	if (adapter->boot_coma == 10) {
-		if (!(adapter->bmsr & BMSR_LSTATUS)
-		    && adapter->registry_phy_coma) {
+		if (!(adapter->bmsr & BMSR_LSTATUS)) {
 			if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) {
 				/* NOTE - This was originally a 'sync with
 				 *  interrupt'. How to do that under Linux?