aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang, Xiong <xiong@qca.qualcomm.com>2012-04-30 11:38:52 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-30 21:44:14 -0400
commite1192580093c5771fc57617e98bb35dc07c7fd54 (patch)
tree555082d6a12750a87f22017d501937c8d5fa2dbf
parent87eabe6bf081d731e1b7998bb0bc2dc179a44ec2 (diff)
atl1c: remove code of closing register writable attribution
The Close-action is done by atl1c_reset_pcie, remove it from atl1c_get_permanent_address. 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>
-rw-r--r--drivers/net/ethernet/atheros/atl1c/atl1c_hw.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
index 49f433e688c7..25226850f613 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
@@ -72,7 +72,6 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
72 u32 i; 72 u32 i;
73 u32 otp_ctrl_data; 73 u32 otp_ctrl_data;
74 u32 twsi_ctrl_data; 74 u32 twsi_ctrl_data;
75 u32 ltssm_ctrl_data;
76 u8 eth_addr[ETH_ALEN]; 75 u8 eth_addr[ETH_ALEN];
77 u16 phy_data; 76 u16 phy_data;
78 bool raise_vol = false; 77 bool raise_vol = false;
@@ -108,11 +107,6 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
108 udelay(20); 107 udelay(20);
109 raise_vol = true; 108 raise_vol = true;
110 } 109 }
111 /* close open bit of ReadOnly*/
112 AT_READ_REG(hw, REG_LTSSM_ID_CTRL, &ltssm_ctrl_data);
113 ltssm_ctrl_data &= ~LTSSM_ID_EN_WRO;
114 AT_WRITE_REG(hw, REG_LTSSM_ID_CTRL, ltssm_ctrl_data);
115
116 110
117 AT_READ_REG(hw, REG_TWSI_CTRL, &twsi_ctrl_data); 111 AT_READ_REG(hw, REG_TWSI_CTRL, &twsi_ctrl_data);
118 twsi_ctrl_data |= TWSI_CTRL_SW_LDSTART; 112 twsi_ctrl_data |= TWSI_CTRL_SW_LDSTART;