Message ID | 20140123082637.GC28688@elgon.mountain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, Jan 23, 2014 at 12:26 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote: > In this situation then ARRAY_SIZE() and sizeof() are the same, but we're > really dealing with array indexes and not byte offsets so ARRAY_SIZE() > is cleaner. Yup. > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Grant Grundler <grundler@parisc-linux.org> cheers grant > > diff --git a/drivers/net/ethernet/dec/tulip/media.c b/drivers/net/ethernet/dec/tulip/media.c > index 0d0ba725341a..dcf21a36a9cf 100644 > --- a/drivers/net/ethernet/dec/tulip/media.c > +++ b/drivers/net/ethernet/dec/tulip/media.c > @@ -457,7 +457,7 @@ void tulip_find_mii(struct net_device *dev, int board_idx) > /* Find the connected MII xcvrs. > Doing this in open() would allow detecting external xcvrs later, > but takes much time. */ > - for (phyn = 1; phyn <= 32 && phy_idx < sizeof (tp->phys); phyn++) { > + for (phyn = 1; phyn <= 32 && phy_idx < ARRAY_SIZE(tp->phys); phyn++) { > int phy = phyn & 0x1f; > int mii_status = tulip_mdio_read (dev, phy, MII_BMSR); > if ((mii_status & 0x8301) == 0x8001 || -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 23 Jan 2014 11:26:37 +0300 > In this situation then ARRAY_SIZE() and sizeof() are the same, but we're > really dealing with array indexes and not byte offsets so ARRAY_SIZE() > is cleaner. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied, thanks Dan. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/dec/tulip/media.c b/drivers/net/ethernet/dec/tulip/media.c index 0d0ba725341a..dcf21a36a9cf 100644 --- a/drivers/net/ethernet/dec/tulip/media.c +++ b/drivers/net/ethernet/dec/tulip/media.c @@ -457,7 +457,7 @@ void tulip_find_mii(struct net_device *dev, int board_idx) /* Find the connected MII xcvrs. Doing this in open() would allow detecting external xcvrs later, but takes much time. */ - for (phyn = 1; phyn <= 32 && phy_idx < sizeof (tp->phys); phyn++) { + for (phyn = 1; phyn <= 32 && phy_idx < ARRAY_SIZE(tp->phys); phyn++) { int phy = phyn & 0x1f; int mii_status = tulip_mdio_read (dev, phy, MII_BMSR); if ((mii_status & 0x8301) == 0x8001 ||
In this situation then ARRAY_SIZE() and sizeof() are the same, but we're really dealing with array indexes and not byte offsets so ARRAY_SIZE() is cleaner. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html