Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b5925fd authored Feb 12, 2007 by Ahmed S. Darwish Committed by Linus Torvalds Feb 12, 2007

[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>

parent b322f409

sound/oss/au1550_ac97.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1354,11 +1354,11 @@ au1550_ioctl(struct inode inode, struct file file, unsigned int cmd,
	((file->f_mode & FMODE_READ) && s->dma_adc.mapped);		((file->f_mode & FMODE_READ) && s->dma_adc.mapped);

	#ifdef DEBUG		#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)		if (ioctl_str[count].cmd == cmd)
	break;		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);		pr_debug("ioctl %s, arg=0x%lxn", ioctl_str[count].str, arg);
	else		else
	pr_debug("ioctl 0x%x unknown, arg=0x%lx\n", cmd, arg);		pr_debug("ioctl 0x%x unknown, arg=0x%lx\n", cmd, arg);

sound/oss/nec_vrc5477.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1381,11 +1381,11 @@ static int vrc5477_ac97_ioctl(struct inode inode, struct file file,
	int val, ret;		int val, ret;

	#ifdef VRC5477_AC97_DEBUG		#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)		if (ioctl_str[count].cmd == cmd)
	break;		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);		printk(KERN_INFO PFX "ioctl %s\n", ioctl_str[count].str);
	else		else
	printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd);		printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd);

sound/oss/swarm_cs4297a.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,7 @@
	#include <linux/poll.h>		#include <linux/poll.h>
	#include <linux/smp_lock.h>		#include <linux/smp_lock.h>
	#include <linux/mutex.h>		#include <linux/mutex.h>
			#include <linux/kernel.h>

	#include <asm/byteorder.h>		#include <asm/byteorder.h>
	#include <asm/dma.h>		#include <asm/dma.h>
	@@ -2676,7 +2677,7 @@ static int __init cs4297a_init(void)
	#if 0		#if 0
	val = SOUND_MASK_LINE;		val = SOUND_MASK_LINE;
	mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);		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;		val = initvol[i].vol;
	mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);		mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
	}		}