X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sound%2Fsound_core.c;h=8f1ced4ab34cb2fbf0dd3143fa882ce916dafac6;hb=0d36da3b409536a24266c5f0972f2e1cfae1afd4;hp=5322c50c9617c2f8aa0850b60e873a5caef26c2d;hpb=5a96c5d0c58ead9a0ece03ffe1c116dea6dafe9c;p=linux-2.6 diff --git a/sound/sound_core.c b/sound/sound_core.c index 5322c50c96..8f1ced4ab3 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -170,8 +170,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); - class_device_create(sound_class, NULL, MKDEV(SOUND_MAJOR, s->unit_minor), - dev, s->name+6); + device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor), + s->name+6); return r; fail: @@ -193,7 +193,7 @@ static void sound_remove_unit(struct sound_unit **list, int unit) p = __sound_remove_unit(list, unit); spin_unlock(&sound_loader_lock); if (p) { - class_device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor)); + device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor)); kfree(p); } }