From: Mark Einon <mark.einon@gmail.com>
Date: Mon, 29 Aug 2011 17:42:39 +0000 (+0100)
Subject: staging: et131x: Remove redundant replica loopback code
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=694bd60383318ebb19b94303781456739ad579b2;p=linux-beck.git

staging: et131x: Remove redundant replica loopback code

A mechanism used to set the phy in loopback mode is not present in the driver, making associated checks and variables redundant. Removing them.

Signed-off-by: Mark Einon <mark.einon@gmail.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 410677ee22b7..38ec56c12987 100644
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -1,6 +1,6 @@
 /*
  * Agere Systems Inc.
- * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs
+ * 10/100/1000 Base-T Ethernet Driver for the ET1310 and ET131x series MACs
  *
  * Copyright © 2005 Agere Systems Inc.
  * All rights reserved.
@@ -149,7 +149,7 @@
  * GLOBAL Module of JAGCore Address Mapping
  * Located at address 0x0000
  */
-struct global_regs {			/* Location: */
+struct global_regs {				/* Location: */
 	u32 txq_start_addr;			/*  0x0000 */
 	u32 txq_end_addr;			/*  0x0004 */
 	u32 rxq_start_addr;			/*  0x0008 */
@@ -163,7 +163,7 @@ struct global_regs {			/* Location: */
 	u32 sw_reset;				/*  0x0028 */
 	u32 slv_timer;				/*  0x002C */
 	u32 msi_config;				/*  0x0030 */
-	u32 loopback;			/*  0x0034 */
+	u32 loopback;				/*  0x0034 */
 	u32 watchdog_timer;			/*  0x0038 */
 };
 
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index e6458dbef934..f50420c582a1 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -988,17 +988,6 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
 	}
 
 	if (len) {
-		if (adapter->replica_phy_loopbk == 1) {
-			buf = rx_local->fbr[ring_index]->virt[buff_index];
-
-			if (memcmp(&buf[6], adapter->addr, ETH_ALEN) == 0) {
-				if (memcmp(&buf[42], "Replica packet",
-					   ETH_HLEN)) {
-					adapter->replica_phy_loopbk_passfail = 1;
-				}
-			}
-		}
-
 		/* Determine if this is a multicast packet coming in */
 		if ((word0 & ALCATEL_MULTICAST_PKT) &&
 		    !(word0 & ALCATEL_BROADCAST_PKT)) {
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index b03460bbb296..508cc632ad8e 100644
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -222,10 +222,6 @@ struct et131x_adapter {
 	/* Rx Memory Variables */
 	struct rx_ring rx_ring;
 
-	/* Loopback specifics */
-	u8 replica_phy_loopbk;		/* Replica Enable */
-	u8 replica_phy_loopbk_passfail;	/* Replica Enable Pass/Fail */
-
 	/* Stats */
 	struct ce_stats stats;
 
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c
index 7cfd213fb136..4d75690e7af2 100644
--- a/drivers/staging/et131x/et131x_isr.c
+++ b/drivers/staging/et131x/et131x_isr.c
@@ -389,17 +389,15 @@ void et131x_isr_handler(struct work_struct *work)
 					(uint8_t) offsetof(struct mi_regs, isr),
 					&myisr);
 
-			if (!adapter->replica_phy_loopbk) {
-				et131x_mii_read(adapter,
-				       (uint8_t) offsetof(struct mi_regs, bmsr),
-				       &bmsr_data);
+			et131x_mii_read(adapter,
+			       (uint8_t) offsetof(struct mi_regs, bmsr),
+			       &bmsr_data);
 
-				bmsr_ints = adapter->bmsr ^ bmsr_data;
-				adapter->bmsr = bmsr_data;
+			bmsr_ints = adapter->bmsr ^ bmsr_data;
+			adapter->bmsr = bmsr_data;
 
-				/* Do all the cable in / cable out stuff */
-				et131x_mii_check(adapter, bmsr_data, bmsr_ints);
-			}
+			/* Do all the cable in / cable out stuff */
+			et131x_mii_check(adapter, bmsr_data, bmsr_ints);
 		}
 
 		/* Let's move on to the TxMac */