[SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API

[linux-2.6-omap-h63xx.git] / sound / sound_core.c

diff --git a/sound/sound_core.c b/sound/sound_core.c
index 68614c3ed5412f2209c16f94bc74d0785a0baa7c..faef87a9bc3fdbac4f5ed27040877de887db6783 100644 (file)
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_SOUND_OSS_CORE
 static int __init init_oss_soundcore(void);
-static void __exit cleanup_oss_soundcore(void);
+static void cleanup_oss_soundcore(void);
 #else
 static inline int init_oss_soundcore(void)     { return 0; }
 static inline void cleanup_oss_soundcore(void) { }
@@ -220,9 +220,8 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati
        else
                sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
 
-       device_create_drvdata(sound_class, dev,
-                             MKDEV(SOUND_MAJOR, s->unit_minor),
-                             NULL, s->name+6);
+       device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor),
+                     NULL, s->name+6);
        return r;
 
  fail:
@@ -574,7 +573,7 @@ int soundcore_open(struct inode *inode, struct file *file)
 
 MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
 
-static void __exit cleanup_oss_soundcore(void)
+static void cleanup_oss_soundcore(void)
 {
        /* We have nothing to really do here - we know the lists must be
           empty */