diff options
Diffstat (limited to 'drivers/net/tehuti.c')
| -rw-r--r-- | drivers/net/tehuti.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 21230c97b2a..17585e5eed5 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c @@ -621,7 +621,7 @@ err: static void __init bdx_firmware_endianess(void) { int i; - for (i = 0; i < sizeof(s_firmLoad) / sizeof(u32); i++) + for (i = 0; i < ARRAY_SIZE(s_firmLoad); i++) s_firmLoad[i] = CPU_CHIP_SWAP32(s_firmLoad[i]); } @@ -2174,8 +2174,7 @@ bdx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) strlcat(drvinfo->bus_info, pci_name(priv->pdev), sizeof(drvinfo->bus_info)); - drvinfo->n_stats = ((priv->stats_flag) ? - (sizeof(bdx_stat_names) / ETH_GSTRING_LEN) : 0); + drvinfo->n_stats = ((priv->stats_flag) ? ARRAY_SIZE(bdx_stat_names) : 0); drvinfo->testinfo_len = 0; drvinfo->regdump_len = 0; drvinfo->eedump_len = 0; @@ -2375,10 +2374,9 @@ static void bdx_get_strings(struct net_device *netdev, u32 stringset, u8 *data) static int bdx_get_stats_count(struct net_device *netdev) { struct bdx_priv *priv = netdev->priv; - BDX_ASSERT(sizeof(bdx_stat_names) / ETH_GSTRING_LEN + BDX_ASSERT(ARRAY_SIZE(bdx_stat_names) != sizeof(struct bdx_stats) / sizeof(u64)); - return ((priv->stats_flag) ? (sizeof(bdx_stat_names) / ETH_GSTRING_LEN) - : 0); + return ((priv->stats_flag) ? ARRAY_SIZE(bdx_stat_names) : 0); } /* |