4 files changed, 23 insertions, 24 deletions

diff --git a/sound/core/sound.c b/sound/core/sound.c
index fa92e660ec2c..0815fadeb3ec 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -64,7 +64,7 @@ static struct list_head snd_minors_hash[SNDRV_CARDS];
 
 static DECLARE_MUTEX(sound_mutex);
 
-extern struct class_simple *sound_class;
+extern struct class *sound_class;
 
 
 #ifdef CONFIG_KMOD
@@ -231,7 +231,7 @@ int snd_register_device(int type, snd_card_t * card, int dev, snd_minor_t * reg,
                 devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, "snd/%s", name);
         if (card)
                 device = card->dev;
-        class_simple_device_add(sound_class, MKDEV(major, minor), device, name);
+        class_device_create(sound_class, MKDEV(major, minor), device, "%s", name);
 
         up(&sound_mutex);
         return 0;
@@ -263,7 +263,7 @@ int snd_unregister_device(int type, snd_card_t * card, int dev)
 
         if (strncmp(mptr->name, "controlC", 8) || card->number >= cards_limit) /* created in sound.c */
                 devfs_remove("snd/%s", mptr->name);
-        class_simple_device_remove(MKDEV(major, minor));
+        class_device_destroy(sound_class, MKDEV(major, minor));
 
         list_del(&mptr->list);
         up(&sound_mutex);
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index a9602f89d6b1..e537bd66a707 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -112,7 +112,7 @@ config SOUND_BCM_CS4297A
 
 config SOUND_ES1370
         tristate "Ensoniq AudioPCI (ES1370)"
-        depends on SOUND_PRIME!=n && SOUND && PCI && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +125,7 @@ config SOUND_ES1370
 
 config SOUND_ES1371
         tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
-        depends on SOUND_PRIME!=n && SOUND && PCI && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +138,7 @@ config SOUND_ES1371
 
 config SOUND_ESSSOLO1
         tristate "ESS Technology Solo1" 
-        depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT && PCI
+        depends on SOUND_PRIME!=n && SOUND && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the ESS Technology
           Solo1 chip. To find out if your sound card uses a
@@ -179,7 +179,7 @@ config SOUND_HARMONY
 
 config SOUND_SONICVIBES
         tristate "S3 SonicVibes"
-        depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND
         help
           Say Y or M if you have a PCI sound card utilizing the S3
           SonicVibes chipset. To find out if your sound card uses a
@@ -226,7 +226,7 @@ config SOUND_AU1550_AC97
 
 config SOUND_TRIDENT
         tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
-        depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND
         ---help---
           Say Y or M if you have a PCI sound card utilizing the Trident
           4DWave-DX/NX chipset or your mother board chipset has SiS 7018
@@ -739,7 +739,7 @@ config SOUND_NM256
 
 config SOUND_MAD16
         tristate "OPTi MAD16 and/or Mozart based cards"
-        depends on SOUND_OSS && SOUND_GAMEPORT
+        depends on SOUND_OSS
         ---help---
           Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
           82C928 or 82C929 or 82C931) audio interface chip. These chips are
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index de91c90a0112..a686be936aff 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -73,7 +73,7 @@ static char     dma_alloc_map[MAX_DMA_CHANNELS];
 
 
 unsigned long seq_time = 0;     /* Time for /dev/sequencer */
-extern struct class_simple *sound_class;
+extern struct class *sound_class;
 
 /*
  * Table for configurable mixer volume handling
@@ -567,9 +567,9 @@ static int __init oss_init(void)
                 devfs_mk_cdev(MKDEV(SOUND_MAJOR, dev_list[i].minor),
                                 S_IFCHR | dev_list[i].mode,
                                 "sound/%s", dev_list[i].name);
-                class_simple_device_add(sound_class, 
-                                        MKDEV(SOUND_MAJOR, dev_list[i].minor),
-                                        NULL, "%s", dev_list[i].name);
+                class_device_create(sound_class,
+                                    MKDEV(SOUND_MAJOR, dev_list[i].minor),
+                                    NULL, "%s", dev_list[i].name);
 
                 if (!dev_list[i].num)
                         continue;
@@ -579,10 +579,9 @@ static int __init oss_init(void)
                                                 dev_list[i].minor + (j*0x10)),
                                         S_IFCHR | dev_list[i].mode,
                                         "sound/%s%d", dev_list[i].name, j);
-                        class_simple_device_add(sound_class,
-                                        MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)),
-                                        NULL,
-                                        "%s%d", dev_list[i].name, j);
+                        class_device_create(sound_class,
+                                            MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)),
+                                            NULL, "%s%d", dev_list[i].name, j);
                 }
         }
 
@@ -598,12 +597,12 @@ static void __exit oss_cleanup(void)
 
         for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) {
                 devfs_remove("sound/%s", dev_list[i].name);
-                class_simple_device_remove(MKDEV(SOUND_MAJOR, dev_list[i].minor));
+                class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor));
                 if (!dev_list[i].num)
                         continue;
                 for (j = 1; j < *dev_list[i].num; j++) {
                         devfs_remove("sound/%s%d", dev_list[i].name, j);
-                        class_simple_device_remove(MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)));
+                        class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)));
                 }
         }
         
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 30f75c9288cb..21a69e096225 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -65,7 +65,7 @@ extern int msnd_classic_init(void);
 extern int msnd_pinnacle_init(void);
 #endif
 
-struct class_simple *sound_class;
+struct class *sound_class;
 EXPORT_SYMBOL(sound_class);
 
 /*
@@ -174,7 +174,7 @@ static int sound_insert_unit(struct sound_unit **list, struct file_operations *f
 
         devfs_mk_cdev(MKDEV(SOUND_MAJOR, s->unit_minor),
                         S_IFCHR | mode, s->name);
-        class_simple_device_add(sound_class, MKDEV(SOUND_MAJOR, s->unit_minor),
+        class_device_create(sound_class, MKDEV(SOUND_MAJOR, s->unit_minor),
                                 NULL, s->name+6);
         return r;
 
@@ -198,7 +198,7 @@ static void sound_remove_unit(struct sound_unit **list, int unit)
         spin_unlock(&sound_loader_lock);
         if (p) {
                 devfs_remove(p->name);
-                class_simple_device_remove(MKDEV(SOUND_MAJOR, p->unit_minor));
+                class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor));
                 kfree(p);
         }
 }
@@ -562,7 +562,7 @@ static void __exit cleanup_soundcore(void)
            empty */
         unregister_chrdev(SOUND_MAJOR, "sound");
         devfs_remove("sound");
-        class_simple_destroy(sound_class);
+        class_destroy(sound_class);
 }
 
 static int __init init_soundcore(void)
@@ -572,7 +572,7 @@ static int __init init_soundcore(void)
                 return -EBUSY;
         }
         devfs_mk_dir ("sound");
-        sound_class = class_simple_create(THIS_MODULE, "sound");
+        sound_class = class_create(THIS_MODULE, "sound");
         if (IS_ERR(sound_class))
                 return PTR_ERR(sound_class);