diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2012-12-20 04:11:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-27 23:29:54 -0500 |
commit | b5a05550b76fe5b934b6f3b7f4b36ae9513745f6 (patch) | |
tree | 1603dbcef8b16e8ae08ad355aa451d75dfff2a42 | |
parent | 101e5c7470eb7f77ae87f966b9155f0dbb5b4698 (diff) |
bnx2x: use ARRAY_SIZE where possible
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index 09096b43a6e9..cb41f5403a75 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |||
@@ -3659,7 +3659,7 @@ static void bnx2x_warpcore_enable_AN_KR2(struct bnx2x_phy *phy, | |||
3659 | bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, | 3659 | bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, |
3660 | MDIO_WC_REG_CL49_USERB0_CTRL, (3<<6)); | 3660 | MDIO_WC_REG_CL49_USERB0_CTRL, (3<<6)); |
3661 | 3661 | ||
3662 | for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); i++) | 3662 | for (i = 0; i < ARRAY_SIZE(reg_set); i++) |
3663 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, | 3663 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, |
3664 | reg_set[i].val); | 3664 | reg_set[i].val); |
3665 | 3665 | ||
@@ -3713,7 +3713,7 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy, | |||
3713 | }; | 3713 | }; |
3714 | DP(NETIF_MSG_LINK, "Enable Auto Negotiation for KR\n"); | 3714 | DP(NETIF_MSG_LINK, "Enable Auto Negotiation for KR\n"); |
3715 | /* Set to default registers that may be overriden by 10G force */ | 3715 | /* Set to default registers that may be overriden by 10G force */ |
3716 | for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); i++) | 3716 | for (i = 0; i < ARRAY_SIZE(reg_set); i++) |
3717 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, | 3717 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, |
3718 | reg_set[i].val); | 3718 | reg_set[i].val); |
3719 | 3719 | ||
@@ -3854,7 +3854,7 @@ static void bnx2x_warpcore_set_10G_KR(struct bnx2x_phy *phy, | |||
3854 | {MDIO_PMA_DEVAD, MDIO_WC_REG_PMD_KR_CONTROL, 0x2} | 3854 | {MDIO_PMA_DEVAD, MDIO_WC_REG_PMD_KR_CONTROL, 0x2} |
3855 | }; | 3855 | }; |
3856 | 3856 | ||
3857 | for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); i++) | 3857 | for (i = 0; i < ARRAY_SIZE(reg_set); i++) |
3858 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, | 3858 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, |
3859 | reg_set[i].val); | 3859 | reg_set[i].val); |
3860 | 3860 | ||
@@ -4242,7 +4242,7 @@ static void bnx2x_warpcore_clear_regs(struct bnx2x_phy *phy, | |||
4242 | bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, | 4242 | bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, |
4243 | MDIO_WC_REG_RX66_CONTROL, (3<<13)); | 4243 | MDIO_WC_REG_RX66_CONTROL, (3<<13)); |
4244 | 4244 | ||
4245 | for (i = 0; i < sizeof(wc_regs)/sizeof(struct bnx2x_reg_set); i++) | 4245 | for (i = 0; i < ARRAY_SIZE(wc_regs); i++) |
4246 | bnx2x_cl45_write(bp, phy, wc_regs[i].devad, wc_regs[i].reg, | 4246 | bnx2x_cl45_write(bp, phy, wc_regs[i].devad, wc_regs[i].reg, |
4247 | wc_regs[i].val); | 4247 | wc_regs[i].val); |
4248 | 4248 | ||
@@ -9520,7 +9520,7 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy, | |||
9520 | } else { | 9520 | } else { |
9521 | /* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */ | 9521 | /* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */ |
9522 | /* (1) set reg 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */ | 9522 | /* (1) set reg 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */ |
9523 | for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); | 9523 | for (i = 0; i < ARRAY_SIZE(reg_set); |
9524 | i++) | 9524 | i++) |
9525 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, | 9525 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, |
9526 | reg_set[i].reg, reg_set[i].val); | 9526 | reg_set[i].reg, reg_set[i].val); |
@@ -9592,7 +9592,7 @@ static void bnx2x_848xx_set_led(struct bnx2x *bp, | |||
9592 | MDIO_PMA_DEVAD, | 9592 | MDIO_PMA_DEVAD, |
9593 | MDIO_PMA_REG_8481_LINK_SIGNAL, val); | 9593 | MDIO_PMA_REG_8481_LINK_SIGNAL, val); |
9594 | 9594 | ||
9595 | for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); i++) | 9595 | for (i = 0; i < ARRAY_SIZE(reg_set); i++) |
9596 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, | 9596 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, |
9597 | reg_set[i].val); | 9597 | reg_set[i].val); |
9598 | 9598 | ||
@@ -13395,7 +13395,7 @@ static void bnx2x_disable_kr2(struct link_params *params, | |||
13395 | }; | 13395 | }; |
13396 | DP(NETIF_MSG_LINK, "Disabling 20G-KR2\n"); | 13396 | DP(NETIF_MSG_LINK, "Disabling 20G-KR2\n"); |
13397 | 13397 | ||
13398 | for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); i++) | 13398 | for (i = 0; i < ARRAY_SIZE(reg_set); i++) |
13399 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, | 13399 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, |
13400 | reg_set[i].val); | 13400 | reg_set[i].val); |
13401 | vars->link_attr_sync &= ~LINK_ATTR_SYNC_KR2_ENABLE; | 13401 | vars->link_attr_sync &= ~LINK_ATTR_SYNC_KR2_ENABLE; |