diff options
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/sound.c | 6 |
1 files changed, 3 insertions, 3 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]; | |||
64 | 64 | ||
65 | static DECLARE_MUTEX(sound_mutex); | 65 | static DECLARE_MUTEX(sound_mutex); |
66 | 66 | ||
67 | extern struct class_simple *sound_class; | 67 | extern struct class *sound_class; |
68 | 68 | ||
69 | 69 | ||
70 | #ifdef CONFIG_KMOD | 70 | #ifdef CONFIG_KMOD |
@@ -231,7 +231,7 @@ int snd_register_device(int type, snd_card_t * card, int dev, snd_minor_t * reg, | |||
231 | devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, "snd/%s", name); | 231 | devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, "snd/%s", name); |
232 | if (card) | 232 | if (card) |
233 | device = card->dev; | 233 | device = card->dev; |
234 | class_simple_device_add(sound_class, MKDEV(major, minor), device, name); | 234 | class_device_create(sound_class, MKDEV(major, minor), device, "%s", name); |
235 | 235 | ||
236 | up(&sound_mutex); | 236 | up(&sound_mutex); |
237 | return 0; | 237 | return 0; |
@@ -263,7 +263,7 @@ int snd_unregister_device(int type, snd_card_t * card, int dev) | |||
263 | 263 | ||
264 | if (strncmp(mptr->name, "controlC", 8) || card->number >= cards_limit) /* created in sound.c */ | 264 | if (strncmp(mptr->name, "controlC", 8) || card->number >= cards_limit) /* created in sound.c */ |
265 | devfs_remove("snd/%s", mptr->name); | 265 | devfs_remove("snd/%s", mptr->name); |
266 | class_simple_device_remove(MKDEV(major, minor)); | 266 | class_device_destroy(sound_class, MKDEV(major, minor)); |
267 | 267 | ||
268 | list_del(&mptr->list); | 268 | list_del(&mptr->list); |
269 | up(&sound_mutex); | 269 | up(&sound_mutex); |