OSDN Git Service

atl1c: remove REG_PHY_STATUS
authorHuang, Xiong <xiong@qca.qualcomm.com>
Wed, 25 Apr 2012 20:27:09 +0000 (20:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Apr 2012 09:03:32 +0000 (05:03 -0400)
this register is used for l1e(dev=1026)
l1c/l1d/l2cb don't use it.

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>
drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
drivers/net/ethernet/atheros/atl1c/atl1c_main.c

index cc7afa1..459e141 100644 (file)
@@ -293,13 +293,6 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define MDIO_AP_EN                     0x10000000
 #define MDIO_WAIT_TIMES                10
 
-/* MII PHY Status Register */
-#define REG_PHY_STATUS                 0x1418
-#define PHY_GENERAL_STATUS_MASK                0xFFFF
-#define PHY_STATUS_RECV_ENABLE         0x0001
-#define PHY_OE_PWSP_STATUS_MASK                0x07FF
-#define PHY_OE_PWSP_STATUS_SHIFT       16
-#define PHY_STATUS_LPW_STATE           0x80000000
 /* BIST Control and Status Register0 (for the Packet Memory) */
 #define REG_BIST0_CTRL                 0x141c
 #define BIST0_NOW                      0x1
index df10637..a6c3f05 100644 (file)
@@ -699,11 +699,9 @@ static void atl1c_set_mac_type(struct atl1c_hw *hw)
 
 static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
 {
-       u32 phy_status_data;
        u32 link_ctrl_data;
 
        atl1c_set_mac_type(hw);
-       AT_READ_REG(hw, REG_PHY_STATUS, &phy_status_data);
        AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
 
        hw->ctrl_flags = ATL1C_INTR_MODRT_ENABLE  |