netdev: use ARRAY_SIZE() instead of sizeof(array) / ETH_GSTRING_LEN
Using ARRAY_SIZE() on arrays of the form array[][K] makes it unnecessary to know the value of K when checking its size. Signed-off-by: Alejandro Martinez Ruiz <alex@flawedcode.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
committed by
David S. Miller
parent
f59d978275
commit
4c3616cdda
@@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user