diff options
author | Eilon Greenstein <eilong@broadcom.com> | 2009-02-12 03:38:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-16 02:31:58 -0500 |
commit | 356e23850b5ed4471470a918623021765fcaf125 (patch) | |
tree | 35de737e86c377773db50abf4a90a631541eb601 /drivers/net/bnx2x_link.c | |
parent | f53722514242da8346cbed2223bcea9eed744ebd (diff) |
bnx2x: Clean-up
Whitespaces, empty lines, 80 columns, indentations and removing redundant
parenthesis
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_link.c')
-rw-r--r-- | drivers/net/bnx2x_link.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c index e1a4e39fc0e3..73b52f17ea84 100644 --- a/drivers/net/bnx2x_link.c +++ b/drivers/net/bnx2x_link.c | |||
@@ -1923,9 +1923,6 @@ static void bnx2x_ext_phy_reset(struct link_params *params, | |||
1923 | break; | 1923 | break; |
1924 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: | 1924 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073: |
1925 | { | 1925 | { |
1926 | u16 emac_base; | ||
1927 | emac_base = (params->port) ? GRCBASE_EMAC0 : | ||
1928 | GRCBASE_EMAC1; | ||
1929 | 1926 | ||
1930 | /* Restore normal power mode*/ | 1927 | /* Restore normal power mode*/ |
1931 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, | 1928 | bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2, |
@@ -3806,7 +3803,7 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params, | |||
3806 | "an_link_status=0x%x\n", | 3803 | "an_link_status=0x%x\n", |
3807 | val2, val1, an1000_status); | 3804 | val2, val1, an1000_status); |
3808 | 3805 | ||
3809 | ext_phy_link_up = (((val1 & 4) == 4) || | 3806 | ext_phy_link_up = (((val1 & 4) == 4) || |
3810 | (an1000_status & (1<<1))); | 3807 | (an1000_status & (1<<1))); |
3811 | if (ext_phy_link_up && | 3808 | if (ext_phy_link_up && |
3812 | bnx2x_8073_is_snr_needed(params)) { | 3809 | bnx2x_8073_is_snr_needed(params)) { |
@@ -4188,7 +4185,7 @@ static void bnx2x_turn_on_ef(struct bnx2x *bp, u8 port, u8 ext_phy_addr, | |||
4188 | ext_phy_addr, | 4185 | ext_phy_addr, |
4189 | MDIO_PMA_DEVAD, | 4186 | MDIO_PMA_DEVAD, |
4190 | MDIO_PMA_REG_CTRL, | 4187 | MDIO_PMA_REG_CTRL, |
4191 | &ctrl); | 4188 | &ctrl); |
4192 | if (!(ctrl & (1<<15))) { | 4189 | if (!(ctrl & (1<<15))) { |
4193 | DP(NETIF_MSG_LINK, "Reset completed\n\n"); | 4190 | DP(NETIF_MSG_LINK, "Reset completed\n\n"); |
4194 | break; | 4191 | break; |