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

[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
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/kernel.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -2998,7 +2999,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic ...@@ -2998,7 +2999,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
val = SOUND_MASK_LINE; val = SOUND_MASK_LINE;
mixdev_ioctl(s->codec, SOUND_MIXER_WRITE_RECSRC, (unsigned long)&val); 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; val = initvol[i].vol;
mixdev_ioctl(s->codec, initvol[i].mixch, (unsigned long)&val); mixdev_ioctl(s->codec, initvol[i].mixch, (unsigned long)&val);
} }
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/kernel.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/wait.h> #include <linux/wait.h>
...@@ -557,7 +558,7 @@ static int __init oss_init(void) ...@@ -557,7 +558,7 @@ static int __init oss_init(void)
/* Protecting the innocent */ /* Protecting the innocent */
sound_dmap_flag = (dmabuf > 0 ? 1 : 0); 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, device_create(sound_class, NULL,
MKDEV(SOUND_MAJOR, dev_list[i].minor), MKDEV(SOUND_MAJOR, dev_list[i].minor),
"%s", dev_list[i].name); "%s", dev_list[i].name);
...@@ -581,7 +582,7 @@ static void __exit oss_cleanup(void) ...@@ -581,7 +582,7 @@ static void __exit oss_cleanup(void)
{ {
int i, j; 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)); device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor));
if (!dev_list[i].num) if (!dev_list[i].num)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment