Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] class: convert sound/* to use the new class api instead of class_simple

Browse Source 
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
gregkh@suse.de 2005-03-23 09:51:41 -08:00 committed by Greg Kroah-Hartman
parent 8561b10f6e
commit 619e666b7e
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/core/sound.c
View File

@ -64,7 +64,7 @@ static struct list_head snd_minors_hash[SNDRV_CARDS];
static DECLARE_MUTEX(sound_mutex); static DECLARE_MUTEX(sound_mutex);
extern struct class_simple *sound_class; extern struct class *sound_class;
#ifdef CONFIG_KMOD #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); devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, "snd/%s", name);
if (card) if (card)
device = card->dev; 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); up(&sound_mutex);
return 0; 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 */ if (strncmp(mptr->name, "controlC", 8) || card->number >= cards_limit) /* created in sound.c */
devfs_remove("snd/%s", mptr->name); 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); list_del(&mptr->list);
up(&sound_mutex); up(&sound_mutex);

13
sound/oss/soundcard.c
View File

@ -73,7 +73,7 @@ static char dma_alloc_map[MAX_DMA_CHANNELS];
unsigned long seq_time = 0; /* Time for /dev/sequencer */ 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 * Table for configurable mixer volume handling
@ -567,7 +567,7 @@ static int __init oss_init(void)
devfs_mk_cdev(MKDEV(SOUND_MAJOR, dev_list[i].minor), devfs_mk_cdev(MKDEV(SOUND_MAJOR, dev_list[i].minor),
S_IFCHR | dev_list[i].mode, S_IFCHR | dev_list[i].mode,
"sound/%s", dev_list[i].name); "sound/%s", dev_list[i].name);
class_simple_device_add(sound_class, class_device_create(sound_class,
MKDEV(SOUND_MAJOR, dev_list[i].minor), MKDEV(SOUND_MAJOR, dev_list[i].minor),
NULL, "%s", dev_list[i].name); NULL, "%s", dev_list[i].name);
@ -579,10 +579,9 @@ static int __init oss_init(void)
dev_list[i].minor + (j*0x10)), dev_list[i].minor + (j*0x10)),
S_IFCHR | dev_list[i].mode, S_IFCHR | dev_list[i].mode,
"sound/%s%d", dev_list[i].name, j); "sound/%s%d", dev_list[i].name, j);
class_simple_device_add(sound_class, class_device_create(sound_class,
MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)), MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)),
NULL, NULL, "%s%d", dev_list[i].name, j);
"%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++) { for (i = 0; i < sizeof (dev_list) / sizeof *dev_list; i++) {
devfs_remove("sound/%s", dev_list[i].name); 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) if (!dev_list[i].num)
continue; continue;
for (j = 1; j < *dev_list[i].num; j++) { for (j = 1; j < *dev_list[i].num; j++) {
devfs_remove("sound/%s%d", dev_list[i].name, 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)));
} }
} }

10
sound/sound_core.c
View File

@ -65,7 +65,7 @@ extern int msnd_classic_init(void);
extern int msnd_pinnacle_init(void); extern int msnd_pinnacle_init(void);
#endif #endif
struct class_simple *sound_class; struct class *sound_class;
EXPORT_SYMBOL(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), devfs_mk_cdev(MKDEV(SOUND_MAJOR, s->unit_minor),
S_IFCHR | mode, s->name); 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); NULL, s->name+6);
return r; return r;
@ -198,7 +198,7 @@ static void sound_remove_unit(struct sound_unit **list, int unit)
spin_unlock(&sound_loader_lock); spin_unlock(&sound_loader_lock);
if (p) { if (p) {
devfs_remove(p->name); 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); kfree(p);
} }
} }
@ -562,7 +562,7 @@ static void __exit cleanup_soundcore(void)
empty */ empty */
unregister_chrdev(SOUND_MAJOR, "sound"); unregister_chrdev(SOUND_MAJOR, "sound");
devfs_remove("sound"); devfs_remove("sound");
class_simple_destroy(sound_class); class_destroy(sound_class);
} }
static int __init init_soundcore(void) static int __init init_soundcore(void)
@ -572,7 +572,7 @@ static int __init init_soundcore(void)
return -EBUSY; return -EBUSY;
} }
devfs_mk_dir ("sound"); devfs_mk_dir ("sound");
sound_class = class_simple_create(THIS_MODULE, "sound"); sound_class = class_create(THIS_MODULE, "sound");
if (IS_ERR(sound_class)) if (IS_ERR(sound_class))
return PTR_ERR(sound_class); return PTR_ERR(sound_class);