From: "Ahmed S. Darwish" <darwish.07@gmail.com> To: Alexey Dobriyan <adobriyan@gmail.com> Cc: jt@hpl.hp.com, linville@tuxdriver.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH 2.6.20] wavelan: Use ARRAY_SIZE macro when appropriate Date: Tue, 6 Feb 2007 11:34:54 +0200 Message-ID: <20070206093454.GS3896@Ahmed> (raw) In-Reply-To: <20070205201709.GB11055@martell.zuzino.mipt.ru> On Mon, Feb 05, 2007 at 11:17:09PM +0300, Alexey Dobriyan wrote: > On Mon, Feb 05, 2007 at 07:00:44PM +0200, Ahmed S. Darwish wrote: > > A trivial patch to use ARRAY_SIZE macro. > > You're supposed to remove it ans use ARRAY_SIZE where old macro is used. > > > --- a/drivers/net/wireless/wavelan.p.h > > +++ b/drivers/net/wireless/wavelan.p.h > > @@ -450,7 +450,7 @@ static const char *version = "wavelan.c : v24 (SMP + wireless extensions) 11/12/ > > #define WATCHDOG_JIFFIES (512*HZ/100) > > > > /* Macro to get the number of elements in an array */ > > -#define NELS(a) (sizeof(a) / sizeof(a[0])) > > +#define NELS(a) ARRAY_SIZE(a) Ooh, how dumb the original patch is :). Thanks, here's the modified patch. A patch to use ARRAY_SIZE macro when appropriate. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> --- diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c index 24221e4..2aa3c76 100644 --- a/drivers/net/wireless/wavelan.c +++ b/drivers/net/wireless/wavelan.c @@ -28,7 +28,7 @@ */ static u8 wv_irq_to_psa(int irq) { - if (irq < 0 || irq >= NELS(irqvals)) + if (irq < 0 || irq >= ARRAY_SIZE(irqvals)) return 0; return irqvals[irq]; @@ -42,7 +42,7 @@ static int __init wv_psa_to_irq(u8 irqval) { int irq; - for (irq = 0; irq < NELS(irqvals); irq++) + for (irq = 0; irq < ARRAY_SIZE(irqvals); irq++) if (irqvals[irq] == irqval) return irq; @@ -1695,7 +1695,7 @@ static int wv_frequency_list(unsigned long ioaddr, /* I/O port of the card */ /* Look in the table if the frequency is allowed */ if (table[9 - (freq / 16)] & (1 << (freq % 16))) { /* Compute approximate channel number */ - while ((c < NELS(channel_bands)) && + while ((c < ARRAY_SIZE(channel_bands)) && (((channel_bands[c] >> 1) - 24) < freq)) c++; list[i].i = c; /* Set the list index */ @@ -4269,7 +4269,7 @@ struct net_device * __init wavelan_probe(int unit) printk(KERN_DEBUG "%s: <-wavelan_probe()\n", dev->name); #endif } else { /* Scan all possible addresses of the WaveLAN hardware. */ - for (i = 0; i < NELS(iobase); i++) { + for (i = 0; i < ARRAY_SIZE(iobase); i++) { dev->irq = def_irq; if (wavelan_config(dev, iobase[i]) == 0) { #ifdef DEBUG_CALLBACK_TRACE @@ -4280,7 +4280,7 @@ struct net_device * __init wavelan_probe(int unit) break; } } - if (i == NELS(iobase)) + if (i == ARRAY_SIZE(iobase)) r = -ENODEV; } if (r) @@ -4327,14 +4327,14 @@ int __init init_module(void) #endif /* Copy the basic set of address to be probed. */ - for (i = 0; i < NELS(iobase); i++) + for (i = 0; i < ARRAY_SIZE(iobase); i++) io[i] = iobase[i]; } /* Loop on all possible base addresses. */ i = -1; - while ((io[++i] != 0) && (i < NELS(io))) { + while ((io[++i] != 0) && (i < ARRAY_SIZE(io))) { struct net_device *dev = alloc_etherdev(sizeof(net_local)); if (!dev) break; diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h index 72b646c..fe24281 100644 --- a/drivers/net/wireless/wavelan.p.h +++ b/drivers/net/wireless/wavelan.p.h @@ -449,9 +449,6 @@ static const char *version = "wavelan.c : v24 (SMP + wireless extensions) 11/12/ /* Watchdog temporisation */ #define WATCHDOG_JIFFIES (512*HZ/100) -/* Macro to get the number of elements in an array */ -#define NELS(a) (sizeof(a) / sizeof(a[0])) - /* ------------------------ PRIVATE IOCTL ------------------------ */ #define SIOCSIPQTHR SIOCIWFIRSTPRIV /* Set quality threshold */ -- Ahmed S. Darwish http://darwish-07.blogspot.com
prev parent reply index Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2007-02-05 16:54 [PATCH 00] A series of patches to use ARRAY_SIZE in `net' drivers Ahmed S. Darwish 2007-02-05 16:55 ` [PATCH 2.6.20] e1000: Use ARRAY_SIZE macro when appropriate Ahmed S. Darwish 2007-02-06 17:16 ` Auke Kok 2007-02-05 16:56 ` [PATCH 2.6.20] ipw2100: " Ahmed S. Darwish 2007-02-05 16:56 ` [PATCH 01/02] misc-net-drivers: " Ahmed S. Darwish 2007-02-05 16:57 ` [PATCH 02/02] " Ahmed S. Darwish 2007-02-05 16:58 ` [PATCH 2.6.20] misc-wireless: " Ahmed S. Darwish 2007-02-05 16:58 ` [PATCH 2.6.20] hostap: " Ahmed S. Darwish 2007-02-05 16:59 ` [PATCH 2.6.20] ibm_emac: " Ahmed S. Darwish 2007-02-05 20:22 ` Alexey Dobriyan 2007-02-06 9:12 ` Ahmed S. Darwish 2007-02-05 16:59 ` [PATCH 2.6.20] ixgb: " Ahmed S. Darwish 2007-02-05 20:18 ` Alexey Dobriyan 2007-02-05 20:31 ` Auke Kok 2007-02-06 10:00 ` Ahmed S. Darwish 2007-02-06 16:48 ` Auke Kok 2007-02-05 17:00 ` [PATCH 2.6.20] wavelan: " Ahmed S. Darwish 2007-02-05 20:17 ` Alexey Dobriyan 2007-02-06 9:34 ` Ahmed S. Darwish [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20070206093454.GS3896@Ahmed \ --to=darwish.07@gmail.com \ --cc=adobriyan@gmail.com \ --cc=jt@hpl.hp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linville@tuxdriver.com \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
LKML Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lkml.kernel.org/lkml/0 lkml/git/0.git git clone --mirror https://lkml.kernel.org/lkml/1 lkml/git/1.git git clone --mirror https://lkml.kernel.org/lkml/2 lkml/git/2.git git clone --mirror https://lkml.kernel.org/lkml/3 lkml/git/3.git git clone --mirror https://lkml.kernel.org/lkml/4 lkml/git/4.git git clone --mirror https://lkml.kernel.org/lkml/5 lkml/git/5.git git clone --mirror https://lkml.kernel.org/lkml/6 lkml/git/6.git git clone --mirror https://lkml.kernel.org/lkml/7 lkml/git/7.git git clone --mirror https://lkml.kernel.org/lkml/8 lkml/git/8.git git clone --mirror https://lkml.kernel.org/lkml/9 lkml/git/9.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 lkml lkml/ https://lkml.kernel.org/lkml \ linux-kernel@vger.kernel.org public-inbox-index lkml Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git