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

Commit b322f409 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Linus Torvalds
Browse files

[PATCH] OSS: Use ARRAY_SIZE macro when appropriate 



Use ARRAY_SIZE macro already defined in kernel.h

Signed-off-by: default avatarAhmed S. Darwish <darwish.07@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d0094de

sound/oss/es1371.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

	}

sound/oss/soundcard.c

+3 −2
Original line number Diff line number Diff line
@@ -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;