diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2010-08-02 07:26:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-02 18:46:32 -0400 |
commit | 80096068bc21420ba4d690341a3c70c49017d167 (patch) | |
tree | cee83745cb3eb158fa48f34a371262cf11b51247 /drivers/net/tg3.h | |
parent | f08aa1a8b8ff0738d42936c3ac8c5516848bca02 (diff) |
tg3: Create phy_flags and migrate phy_is_low_power
This patch deletes the link_config.phy_is_low_power flag and creates a
new phy_flags device member to store all phy related settings. All the
code is converted accordingly.
Reviewed-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r-- | drivers/net/tg3.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index d40c380802b0..5d684d2b4034 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2534,7 +2534,6 @@ struct tg3_link_config { | |||
2534 | /* When we go in and out of low power mode we need | 2534 | /* When we go in and out of low power mode we need |
2535 | * to swap with this state. | 2535 | * to swap with this state. |
2536 | */ | 2536 | */ |
2537 | int phy_is_low_power; | ||
2538 | u16 orig_speed; | 2537 | u16 orig_speed; |
2539 | u8 orig_duplex; | 2538 | u8 orig_duplex; |
2540 | u8 orig_autoneg; | 2539 | u8 orig_autoneg; |
@@ -2965,6 +2964,9 @@ struct tg3 { | |||
2965 | (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM5719C || \ | 2964 | (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM5719C || \ |
2966 | (X) == TG3_PHY_ID_BCM8002) | 2965 | (X) == TG3_PHY_ID_BCM8002) |
2967 | 2966 | ||
2967 | u32 phy_flags; | ||
2968 | #define TG3_PHYFLG_IS_LOW_POWER 0x00000001 | ||
2969 | |||
2968 | u32 led_ctrl; | 2970 | u32 led_ctrl; |
2969 | u32 phy_otp; | 2971 | u32 phy_otp; |
2970 | 2972 | ||