Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 619e666b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8561b10f

sound/core/sound.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

sound/oss/soundcard.c

+9 −10
Original line number Diff line number Diff line
@@ -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,7 +567,7 @@ 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, 

		class_device_create(sound_class,

				    MKDEV(SOUND_MAJOR, dev_list[i].minor),

				    NULL, "%s", dev_list[i].name);
@@ -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,

			class_device_create(sound_class,

					    MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)),

					NULL,

					"%s%d", dev_list[i].name, j);

					    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)));

		}

	}

sound/sound_core.c

+5 −5
Original line number Diff line number Diff line
@@ -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);