aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/soundcard.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:06 -0400
commit0936f26f55918af595b108208e64c37a0a481722 (patch)
treeb9bbefd4d57b474a349f31e0d3d9de5a239251bf /sound/oss/soundcard.c
parent94f6c59dcf16f10a20fbe3d1f098b159433f94bd (diff)
[PATCH] devfs: Remove devfs support from the sound subsystem
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/oss/soundcard.c')
-rw-r--r--sound/oss/soundcard.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index d33bb464f70e..a33289948902 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -38,7 +38,6 @@
38#include <linux/wait.h> 38#include <linux/wait.h>
39#include <linux/slab.h> 39#include <linux/slab.h>
40#include <linux/ioport.h> 40#include <linux/ioport.h>
41#include <linux/devfs_fs_kernel.h>
42#include <linux/major.h> 41#include <linux/major.h>
43#include <linux/delay.h> 42#include <linux/delay.h>
44#include <linux/proc_fs.h> 43#include <linux/proc_fs.h>
@@ -564,9 +563,6 @@ static int __init oss_init(void)
564 sound_dmap_flag = (dmabuf > 0 ? 1 : 0); 563 sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
565 564
566 for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) { 565 for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) {
567 devfs_mk_cdev(MKDEV(SOUND_MAJOR, dev_list[i].minor),
568 S_IFCHR | dev_list[i].mode,
569 "sound/%s", dev_list[i].name);
570 class_device_create(sound_class, NULL, 566 class_device_create(sound_class, NULL,
571 MKDEV(SOUND_MAJOR, dev_list[i].minor), 567 MKDEV(SOUND_MAJOR, dev_list[i].minor),
572 NULL, "%s", dev_list[i].name); 568 NULL, "%s", dev_list[i].name);
@@ -574,15 +570,10 @@ static int __init oss_init(void)
574 if (!dev_list[i].num) 570 if (!dev_list[i].num)
575 continue; 571 continue;
576 572
577 for (j = 1; j < *dev_list[i].num; j++) { 573 for (j = 1; j < *dev_list[i].num; j++)
578 devfs_mk_cdev(MKDEV(SOUND_MAJOR,
579 dev_list[i].minor + (j*0x10)),
580 S_IFCHR | dev_list[i].mode,
581 "sound/%s%d", dev_list[i].name, j);
582 class_device_create(sound_class, NULL, 574 class_device_create(sound_class, NULL,
583 MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)), 575 MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)),
584 NULL, "%s%d", dev_list[i].name, j); 576 NULL, "%s%d", dev_list[i].name, j);
585 }
586 } 577 }
587 578
588 if (sound_nblocks >= 1024) 579 if (sound_nblocks >= 1024)
@@ -596,14 +587,11 @@ static void __exit oss_cleanup(void)
596 int i, j; 587 int i, j;
597 588
598 for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) { 589 for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) {
599 devfs_remove("sound/%s", dev_list[i].name);
600 class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor)); 590 class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor));
601 if (!dev_list[i].num) 591 if (!dev_list[i].num)
602 continue; 592 continue;
603 for (j = 1; j < *dev_list[i].num; j++) { 593 for (j = 1; j < *dev_list[i].num; j++)
604 devfs_remove("sound/%s%d", dev_list[i].name, j);
605 class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10))); 594 class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)));
606 }
607 } 595 }
608 596
609 unregister_sound_special(1); 597 unregister_sound_special(1);