aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sound_core.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/sound_core.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/sound_core.c')
-rw-r--r--sound/sound_core.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 6f849720aef3..7535ec821dcf 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -44,7 +44,6 @@
44#include <linux/sound.h> 44#include <linux/sound.h>
45#include <linux/major.h> 45#include <linux/major.h>
46#include <linux/kmod.h> 46#include <linux/kmod.h>
47#include <linux/devfs_fs_kernel.h>
48#include <linux/device.h> 47#include <linux/device.h>
49 48
50#define SOUND_STEP 16 49#define SOUND_STEP 16
@@ -172,8 +171,6 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati
172 else 171 else
173 sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP); 172 sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
174 173
175 devfs_mk_cdev(MKDEV(SOUND_MAJOR, s->unit_minor),
176 S_IFCHR | mode, s->name);
177 class_device_create(sound_class, NULL, MKDEV(SOUND_MAJOR, s->unit_minor), 174 class_device_create(sound_class, NULL, MKDEV(SOUND_MAJOR, s->unit_minor),
178 dev, s->name+6); 175 dev, s->name+6);
179 return r; 176 return r;
@@ -197,7 +194,6 @@ static void sound_remove_unit(struct sound_unit **list, int unit)
197 p = __sound_remove_unit(list, unit); 194 p = __sound_remove_unit(list, unit);
198 spin_unlock(&sound_loader_lock); 195 spin_unlock(&sound_loader_lock);
199 if (p) { 196 if (p) {
200 devfs_remove(p->name);
201 class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor)); 197 class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor));
202 kfree(p); 198 kfree(p);
203 } 199 }
@@ -570,7 +566,6 @@ static void __exit cleanup_soundcore(void)
570 /* We have nothing to really do here - we know the lists must be 566 /* We have nothing to really do here - we know the lists must be
571 empty */ 567 empty */
572 unregister_chrdev(SOUND_MAJOR, "sound"); 568 unregister_chrdev(SOUND_MAJOR, "sound");
573 devfs_remove("sound");
574 class_destroy(sound_class); 569 class_destroy(sound_class);
575} 570}
576 571
@@ -580,7 +575,6 @@ static int __init init_soundcore(void)
580 printk(KERN_ERR "soundcore: sound device already in use.\n"); 575 printk(KERN_ERR "soundcore: sound device already in use.\n");
581 return -EBUSY; 576 return -EBUSY;
582 } 577 }
583 devfs_mk_dir ("sound");
584 sound_class = class_create(THIS_MODULE, "sound"); 578 sound_class = class_create(THIS_MODULE, "sound");
585 if (IS_ERR(sound_class)) 579 if (IS_ERR(sound_class))
586 return PTR_ERR(sound_class); 580 return PTR_ERR(sound_class);