Merge branch 'net-ARRAY_SIZE'

zhong jiang says:

====================
Use ARRAY_SIZE to replace computing the size

zhong jiang (2):
  net:usb: Use ARRAY_SIZE instead of calculating the array size
  include/net/bond_3ad: Simplify the code by using the ARRAY_SIZE
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 4662fa0381f9..a9991c5f4736 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -1649,7 +1649,7 @@ lan78xx_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
         struct lan78xx_net *dev = netdev_priv(netdev);
 
         /* Read Device/MAC registers */
-        for (i = 0; i < (sizeof(lan78xx_regs) / sizeof(u32)); i++)
+        for (i = 0; i < ARRAY_SIZE(lan78xx_regs); i++)
                 lan78xx_read_reg(dev, lan78xx_regs[i], &data[i]);
 
         if (!netdev->phydev)
diff --git a/include/net/bond_3ad.h b/include/net/bond_3ad.h
index f358ad5e4214..fc3111515f5c 100644
--- a/include/net/bond_3ad.h
+++ b/include/net/bond_3ad.h
@@ -283,7 +283,7 @@ static inline const char *bond_3ad_churn_desc(churn_state_t state)
                 "none",
                 "unknown"
         };
-        int max_size = sizeof(churn_description) / sizeof(churn_description[0]);
+        int max_size = ARRAY_SIZE(churn_description);
 
         if (state >= max_size)
                 state = max_size - 1;