[PATCH] atl1: fix suspend regression

[PATCH] atl1: fix suspend regression

[Jay Cliburn]

From: Jay Cliburn <jacliburn@bellsouth.net>
Date: Sun, 1 Jun 2008 16:57:11 -0500
Subject: [PATCH] atl1: fix suspend regression

Using vendor magic to force the PHY into power save mode breaks
suspend.  It isn't needed anyway, so remove it.

Tested-by: Avuton Olrich <avuton@gmail.com>
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
---
 drivers/net/atlx/atl1.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 6e4c80d..1a2f93d 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -637,22 +637,6 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw)
 }
 
 /*
- * Force the PHY into power saving mode using vendor magic.
- */
-#ifdef CONFIG_PM
-static void atl1_phy_enter_power_saving(struct atl1_hw *hw)
-{
-	atl1_write_phy_reg(hw, MII_DBG_ADDR, 0);
-	atl1_write_phy_reg(hw, MII_DBG_DATA, 0x124E);
-	atl1_write_phy_reg(hw, MII_DBG_ADDR, 2);
-	atl1_write_phy_reg(hw, MII_DBG_DATA, 0x3000);
-	atl1_write_phy_reg(hw, MII_DBG_ADDR, 3);
-	atl1_write_phy_reg(hw, MII_DBG_DATA, 0);
-
-}
-#endif
-
-/*
  * Resets the PHY and make all config validate
  * hw - Struct containing variables accessed by shared code
  *
@@ -2859,7 +2843,6 @@ disable_wol:
 	ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
 	iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
 	ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
-	atl1_phy_enter_power_saving(hw);
 	hw->phy_configured = false;
 	pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
 exit:
-- 
1.5.5.1

Re: [PATCH] atl1: fix suspend regression

[Jeff Garzik]

Jay Cliburn wrote:
> From: Jay Cliburn <jacliburn@bellsouth.net>
> Date: Sun, 1 Jun 2008 16:57:11 -0500
> Subject: [PATCH] atl1: fix suspend regression
> 
> Using vendor magic to force the PHY into power save mode breaks
> suspend.  It isn't needed anyway, so remove it.
> 
> Tested-by: Avuton Olrich <avuton@gmail.com>
> Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>

applied