diff options
author | Huang, Xiong <xiong@qca.qualcomm.com> | 2012-04-25 16:27:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-26 05:03:32 -0400 |
commit | ce3ba0c995c194bb922fd449d72a5d006c702aec (patch) | |
tree | 248bdc4e7dc16cc2c7409e3c89eea1f64ef80f41 /drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |
parent | 929a5e9318f090e190b67343fb37533e58aec3a3 (diff) |
atl1c: remove PHY contrl in atl1c_reset_pcie
atl1c_reset_phy follows atl1c_reset_pcie in the whole driver,
so, it's unnecessary to add PHY control code in atl1c_reset_pcie.
Signed-off-by: xiong <xiong@qca.qualcomm.com>
Tested-by: Liu David <dwliu@qca.qualcomm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/atl1c/atl1c_main.c')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 1f82880904df..f0f348bf6c16 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -165,11 +165,6 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag) | |||
165 | atl1c_pcie_patch(hw); | 165 | atl1c_pcie_patch(hw); |
166 | if (flag & ATL1C_PCIE_L0S_L1_DISABLE) | 166 | if (flag & ATL1C_PCIE_L0S_L1_DISABLE) |
167 | atl1c_disable_l0s_l1(hw); | 167 | atl1c_disable_l0s_l1(hw); |
168 | if (flag & ATL1C_PCIE_PHY_RESET) | ||
169 | AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_DEFAULT); | ||
170 | else | ||
171 | AT_WRITE_REG(hw, REG_GPHY_CTRL, | ||
172 | GPHY_CTRL_DEFAULT | GPHY_CTRL_EXT_RESET); | ||
173 | 168 | ||
174 | msleep(5); | 169 | msleep(5); |
175 | } | 170 | } |
@@ -2409,8 +2404,7 @@ static int atl1c_resume(struct device *dev) | |||
2409 | struct atl1c_adapter *adapter = netdev_priv(netdev); | 2404 | struct atl1c_adapter *adapter = netdev_priv(netdev); |
2410 | 2405 | ||
2411 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); | 2406 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); |
2412 | atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE | | 2407 | atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE); |
2413 | ATL1C_PCIE_PHY_RESET); | ||
2414 | 2408 | ||
2415 | atl1c_phy_reset(&adapter->hw); | 2409 | atl1c_phy_reset(&adapter->hw); |
2416 | atl1c_reset_mac(&adapter->hw); | 2410 | atl1c_reset_mac(&adapter->hw); |
@@ -2568,8 +2562,7 @@ static int __devinit atl1c_probe(struct pci_dev *pdev, | |||
2568 | dev_err(&pdev->dev, "net device private data init failed\n"); | 2562 | dev_err(&pdev->dev, "net device private data init failed\n"); |
2569 | goto err_sw_init; | 2563 | goto err_sw_init; |
2570 | } | 2564 | } |
2571 | atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE | | 2565 | atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE); |
2572 | ATL1C_PCIE_PHY_RESET); | ||
2573 | 2566 | ||
2574 | /* Init GPHY as early as possible due to power saving issue */ | 2567 | /* Init GPHY as early as possible due to power saving issue */ |
2575 | atl1c_phy_reset(&adapter->hw); | 2568 | atl1c_phy_reset(&adapter->hw); |