From 52f7416fc13e4c3fc7268820083ae2eae3917508 Mon Sep 17 00:00:00 2001
From: Mark Einon <mark.einon@gmail.com>
Date: Mon, 29 Aug 2011 18:42:38 +0100
Subject: [PATCH] --- yaml --- r: 268077 b: refs/heads/master c:
 4a334d898a5cdbbe6d7a923a5106526ea82a9ffc h: refs/heads/master i:   268075:
 020dfd35918f6847c4a78c52bf100ba7b7a1160d v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/et131x/et1310_phy.c     | 4 ----
 trunk/drivers/staging/et131x/et131x_adapter.h | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e54a81432738..f7063b77843e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dc2bbe72ec31469286027ebce6a00f05ef38a9f
+refs/heads/master: 4a334d898a5cdbbe6d7a923a5106526ea82a9ffc
diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c
index c845c27f23db..21e070427950 100644
--- a/trunk/drivers/staging/et131x/et1310_phy.c
+++ b/trunk/drivers/staging/et131x/et1310_phy.c
@@ -242,7 +242,6 @@ int et131x_xcvr_find(struct et131x_adapter *adapter)
 	u8 xcvr_addr;
 	u16 idr1;
 	u16 idr2;
-	u32 xcvr_id;
 
 	/* We need to get xcvr id and address we just get the first one */
 	for (xcvr_addr = 0; xcvr_addr < 32; xcvr_addr++) {
@@ -254,10 +253,7 @@ int et131x_xcvr_find(struct et131x_adapter *adapter)
 			     (u8) offsetof(struct mi_regs, idr2),
 			     &idr2);
 
-		xcvr_id = (u32) ((idr1 << 16) | idr2);
-
 		if (idr1 != 0 && idr1 != 0xffff) {
-			adapter->stats.xcvr_id = xcvr_id;
 			adapter->stats.xcvr_addr = xcvr_addr;
 			return 0;
 		}
diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h
index 762e07ca3ee2..b03460bbb296 100644
--- a/trunk/drivers/staging/et131x/et131x_adapter.h
+++ b/trunk/drivers/staging/et131x/et131x_adapter.h
@@ -115,7 +115,6 @@ struct ce_stats {
 
 	/* Transceiver state informations. */
 	u8		xcvr_addr;
-	u32		xcvr_id;
 
 	/* Tx Statistics. */
 	u32		tx_underflows;