diff options
| author | Ahmed S. Darwish <darwish.07@gmail.com> | 2007-02-12 09:52:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:48:28 +0100 |
| commit | b322f4095056d6849c49412eb3e36637a062e9c0 (patch) | |
| tree | e9923a60b1a38cd6d1609d21fe74d7dada28e09f | |
| parent | [PATCH] w1: Use ARRAY_SIZE macro when appropriate (diff) | |
| download | linux-b322f4095056d6849c49412eb3e36637a062e9c0.tar.xz linux-b322f4095056d6849c49412eb3e36637a062e9c0.zip | |
[PATCH] OSS: Use ARRAY_SIZE macro when appropriate
Use ARRAY_SIZE macro already defined in kernel.h
Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | sound/oss/es1371.c | 3 | ||||
| -rw-r--r-- | sound/oss/soundcard.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c index cc282a0cd539..e1fbcca8e722 100644 --- a/sound/oss/es1371.c +++ b/sound/oss/es1371.c @@ -131,6 +131,7 @@ #include <linux/dma-mapping.h> #include <linux/mutex.h> #include <linux/mm.h> +#include <linux/kernel.h> #include <asm/io.h> #include <asm/page.h> @@ -2998,7 +2999,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic set_fs(KERNEL_DS); val = SOUND_MASK_LINE; mixdev_ioctl(s->codec, SOUND_MIXER_WRITE_RECSRC, (unsigned long)&val); - for (i = 0; i < sizeof(initvol)/sizeof(initvol[0]); i++) { + for (i = 0; i < ARRAY_SIZE(initvol); i++) { val = initvol[i].vol; mixdev_ioctl(s->codec, initvol[i].mixch, (unsigned long)&val); } diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index a89108cb74ea..b92c8cd1aeaf 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -32,6 +32,7 @@ #include <linux/ctype.h> #include <linux/stddef.h> #include <linux/kmod.h> +#include <linux/kernel.h> #include <asm/dma.h> #include <asm/io.h> #include <linux/wait.h> @@ -557,7 +558,7 @@ static int __init oss_init(void) /* Protecting the innocent */ sound_dmap_flag = (dmabuf > 0 ? 1 : 0); - for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) { + for (i = 0; i < ARRAY_SIZE(dev_list); i++) { device_create(sound_class, NULL, MKDEV(SOUND_MAJOR, dev_list[i].minor), "%s", dev_list[i].name); @@ -581,7 +582,7 @@ static void __exit oss_cleanup(void) { int i, j; - for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) { + for (i = 0; i < ARRAY_SIZE(dev_list); i++) { device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor)); if (!dev_list[i].num) continue; |