diff options
| author | Ahmed S. Darwish <darwish.07@gmail.com> | 2007-02-12 00:52:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 09:48:29 -0800 |
| commit | 8b5925fd5461c9f1ac77ede48945ca1945202ddb (patch) | |
| tree | 20bd72cd17d4bf77b6a56d383e4824db1655cc98 /sound | |
| parent | b322f4095056d6849c49412eb3e36637a062e9c0 (diff) | |
[PATCH] OSS: Use ARRAY_SIZE macro when appropriate (2)
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/au1550_ac97.c | 4 | ||||
| -rw-r--r-- | sound/oss/nec_vrc5477.c | 4 | ||||
| -rw-r--r-- | sound/oss/swarm_cs4297a.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 219795171c7..a339f0c0d51 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c @@ -1354,11 +1354,11 @@ au1550_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ((file->f_mode & FMODE_READ) && s->dma_adc.mapped); #ifdef DEBUG - for (count=0; count<sizeof(ioctl_str)/sizeof(ioctl_str[0]); count++) { + for (count = 0; count < ARRAY_SIZE(ioctl_str); count++) { if (ioctl_str[count].cmd == cmd) break; } - if (count < sizeof(ioctl_str) / sizeof(ioctl_str[0])) + if (count < ARRAY_SIZE(ioctl_str)) pr_debug("ioctl %s, arg=0x%lxn", ioctl_str[count].str, arg); else pr_debug("ioctl 0x%x unknown, arg=0x%lx\n", cmd, arg); diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c index da9728e1772..d459bdb1415 100644 --- a/sound/oss/nec_vrc5477.c +++ b/sound/oss/nec_vrc5477.c @@ -1381,11 +1381,11 @@ static int vrc5477_ac97_ioctl(struct inode *inode, struct file *file, int val, ret; #ifdef VRC5477_AC97_DEBUG - for (count=0; count<sizeof(ioctl_str)/sizeof(ioctl_str[0]); count++) { + for (count = 0; count < ARRAY_SIZE(ioctl_str); count++) { if (ioctl_str[count].cmd == cmd) break; } - if (count < sizeof(ioctl_str)/sizeof(ioctl_str[0])) + if (count < ARRAY_SIZE(ioctl_str)) printk(KERN_INFO PFX "ioctl %s\n", ioctl_str[count].str); else printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd); diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 471c274c500..9f7e5f59ac8 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -77,6 +77,7 @@ #include <linux/poll.h> #include <linux/smp_lock.h> #include <linux/mutex.h> +#include <linux/kernel.h> #include <asm/byteorder.h> #include <asm/dma.h> @@ -2676,7 +2677,7 @@ static int __init cs4297a_init(void) #if 0 val = SOUND_MASK_LINE; mixer_ioctl(s, 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; mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val); } |