Subject: [PATCH] spidernet: remove unnecessary accesses to phy

From: [email-masked] (Linas Vepstas)
Date: Thu, 10 May 2007 12:18:48 -0500

Jeff, please apply for 2.6.22; This is a purely janitorial patch.

(I will have additonal patches for the spidernet in a few days;
I'm still debugging a rather nasty hang.)

--linas

From: Ishizaki Kou <[email-masked]>

This patch removes unnecessary accesses to phy registers.

Signed-off-by: Kou Ishizaki <[email-masked]>
Signed-off-by: Linas Vepstas <[email-masked]>

----
 drivers/net/spider_net.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Index: linux-2.6.21-rc7-mm2/drivers/net/spider_net.c
===================================================================
--- linux-2.6.21-rc7-mm2.orig/drivers/net/spider_net.c	2007-05-09 14:19:29.000000000 -0500
+++ linux-2.6.21-rc7-mm2/drivers/net/spider_net.c	2007-05-09 14:20:28.000000000 -0500
@@ -175,12 +175,10 @@ spider_net_setup_aneg(struct spider_net_
 {
 	struct mii_phy *phy = &card->phy;
 	u32 advertise = 0;
-	u16 bmcr, bmsr, stat1000, estat;
+	u16 bmsr, estat;
 
-	bmcr     = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMCR);
-	bmsr     = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR);
-	stat1000 = spider_net_read_phy(card->netdev, phy->mii_id, MII_STAT1000);
-	estat    = spider_net_read_phy(card->netdev, phy->mii_id, MII_ESTATUS);
+	bmsr  = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR);
+	estat = spider_net_read_phy(card->netdev, phy->mii_id, MII_ESTATUS);
 
 	if (bmsr & BMSR_10HALF)
 		advertise |= ADVERTISED_10baseT_Half;