Commit b046d244 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: core: Remove superfluous exit calls for proc entries 



Since each proc entry is freed automatically by the parent, we don't
have to take care of its life cycle any longer.  This allows us to
reduce a few more lines of codes.

Acked-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 644dbd64

include/sound/core.h

+0 −4
Original line number Diff line number Diff line
@@ -224,16 +224,13 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type); 
#endif



int snd_minor_info_init(void);

int snd_minor_info_done(void);



/* sound_oss.c */



#ifdef CONFIG_SND_OSSEMUL

int snd_minor_info_oss_init(void);

int snd_minor_info_oss_done(void);

#else

static inline int snd_minor_info_oss_init(void) { return 0; }

static inline int snd_minor_info_oss_done(void) { return 0; }

#endif



/* memory.c */
@@ -262,7 +259,6 @@ int snd_card_free_when_closed(struct snd_card *card); 
void snd_card_set_id(struct snd_card *card, const char *id);

int snd_card_register(struct snd_card *card);

int snd_card_info_init(void);

int snd_card_info_done(void);

int snd_card_add_dev_attr(struct snd_card *card,

			  const struct attribute_group *group);

int snd_component_add(struct snd_card *card, const char *component);

sound/core/info.c

+0 −3
Original line number Diff line number Diff line
@@ -495,9 +495,6 @@ int __init snd_info_init(void) 


int __exit snd_info_done(void)

{

	snd_card_info_done();

	snd_minor_info_oss_done();

	snd_minor_info_done();

	snd_info_free_entry(snd_proc_root);

	return 0;

}

sound/core/init.c

+0 −17
Original line number Diff line number Diff line
@@ -783,8 +783,6 @@ int snd_card_register(struct snd_card *card) 
EXPORT_SYMBOL(snd_card_register);



#ifdef CONFIG_PROC_FS

static struct snd_info_entry *snd_card_info_entry;



static void snd_card_info_read(struct snd_info_entry *entry,

			       struct snd_info_buffer *buffer)

{
@@ -810,7 +808,6 @@ static void snd_card_info_read(struct snd_info_entry *entry, 
}



#ifdef CONFIG_SND_OSSEMUL



void snd_card_info_read_oss(struct snd_info_buffer *buffer)

{

	int idx, count;
@@ -832,7 +829,6 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer) 
#endif



#ifdef MODULE

static struct snd_info_entry *snd_card_module_info_entry;

static void snd_card_module_info_read(struct snd_info_entry *entry,

				      struct snd_info_buffer *buffer)

{
@@ -861,7 +857,6 @@ int __init snd_card_info_init(void) 
		snd_info_free_entry(entry);

		return -ENOMEM;

	}

	snd_card_info_entry = entry;



#ifdef MODULE

	entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL);
@@ -869,23 +864,11 @@ int __init snd_card_info_init(void) 
		entry->c.text.read = snd_card_module_info_read;

		if (snd_info_register(entry) < 0)

			snd_info_free_entry(entry);

		else

			snd_card_module_info_entry = entry;

	}

#endif



	return 0;

}



int __exit snd_card_info_done(void)

{

	snd_info_free_entry(snd_card_info_entry);

#ifdef MODULE

	snd_info_free_entry(snd_card_module_info_entry);

#endif

	return 0;

}



#endif /* CONFIG_PROC_FS */



/**

sound/core/sound.c

+0 −10
Original line number Diff line number Diff line
@@ -334,9 +334,6 @@ EXPORT_SYMBOL(snd_unregister_device); 
/*

 *  INFO PART

 */



static struct snd_info_entry *snd_minor_info_entry;



static const char *snd_device_type_name(int type)

{

	switch (type) {
@@ -396,13 +393,6 @@ int __init snd_minor_info_init(void) 
			entry = NULL;

		}

	}

	snd_minor_info_entry = entry;

	return 0;

}



int __exit snd_minor_info_done(void)

{

	snd_info_free_entry(snd_minor_info_entry);

	return 0;

}

#endif /* CONFIG_PROC_FS */

sound/core/sound_oss.c

+1 −13
Original line number Diff line number Diff line
@@ -214,9 +214,6 @@ EXPORT_SYMBOL(snd_unregister_oss_device); 
 */



#ifdef CONFIG_PROC_FS



static struct snd_info_entry *snd_minor_info_oss_entry;



static const char *snd_oss_device_type_name(int type)

{

	switch (type) {
@@ -265,18 +262,9 @@ int __init snd_minor_info_oss_init(void) 
	entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);

	if (entry) {

		entry->c.text.read = snd_minor_info_oss_read;

		if (snd_info_register(entry) < 0) {

		if (snd_info_register(entry) < 0)

			snd_info_free_entry(entry);

			entry = NULL;

	}

	}

	snd_minor_info_oss_entry = entry;

	return 0;

}



int __exit snd_minor_info_oss_done(void)

{

	snd_info_free_entry(snd_minor_info_oss_entry);

	return 0;

}

#endif /* CONFIG_PROC_FS */