UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: replace CONFIG_PROC_FS with CONFIG_SND_PROC_FS 

We may disable proc fs only for sound part, to reduce ALSA
memory footprint. So add CONFIG_SND_PROC_FS and replace the
old CONFIG_PROC_FSs in alsa code.

With sound proc fs disabled, we can save about 9KB memory
size on X86_64 platform.

Signed-off-by: Jie Yang <yang.jie@intel.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jie Yang 2015-05-27 19:45:45 +08:00 committed by Takashi Iwai
parent e0ecb05a96
commit cd6a65036f
24 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sound/info.h
View File

@ -92,14 +92,14 @@ struct snd_info_entry {
struct list_head list; struct list_head list;
}; };
#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS) #if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_SND_PROC_FS)
int snd_info_minor_register(void); int snd_info_minor_register(void);
#else #else
#define snd_info_minor_register() 0 #define snd_info_minor_register() 0
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
extern struct snd_info_entry *snd_seq_root; extern struct snd_info_entry *snd_seq_root;
#ifdef CONFIG_SND_OSSEMUL #ifdef CONFIG_SND_OSSEMUL
@ -197,7 +197,7 @@ static inline int snd_info_check_reserved_words(const char *str) { return 1; }
* OSS info part * OSS info part
*/ */
#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS) #if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_SND_PROC_FS)
#define SNDRV_OSS_INFO_DEV_AUDIO 0 #define SNDRV_OSS_INFO_DEV_AUDIO 0
#define SNDRV_OSS_INFO_DEV_SYNTH 1 #define SNDRV_OSS_INFO_DEV_SYNTH 1
@ -210,6 +210,6 @@ static inline int snd_info_check_reserved_words(const char *str) { return 1; }
int snd_oss_info_register(int dev, int num, char *string); int snd_oss_info_register(int dev, int num, char *string);
#define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL) #define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL)
#endif /* CONFIG_SND_OSSEMUL && CONFIG_PROC_FS */ #endif /* CONFIG_SND_OSSEMUL && CONFIG_SND_PROC_FS */
#endif /* __SOUND_INFO_H */ #endif /* __SOUND_INFO_H */

2
sound/core/Makefile
View File

@ -4,7 +4,7 @@
# #
snd-y := sound.o init.o memory.o control.o misc.o device.o snd-y := sound.o init.o memory.o control.o misc.o device.o
ifneq ($(CONFIG_PROC_FS),) ifneq ($(CONFIG_SND_PROC_FS),)
snd-y += info.o snd-y += info.o
snd-$(CONFIG_SND_OSSEMUL) += info_oss.o snd-$(CONFIG_SND_OSSEMUL) += info_oss.o
endif endif

6
sound/core/hwdep.c
View File

@ -484,7 +484,7 @@ static int snd_hwdep_dev_disconnect(struct snd_device *device)
return 0; return 0;
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* Info interface * Info interface
*/ */
@ -521,10 +521,10 @@ static void __exit snd_hwdep_proc_done(void)
{ {
snd_info_free_entry(snd_hwdep_proc_entry); snd_info_free_entry(snd_hwdep_proc_entry);
} }
#else /* !CONFIG_PROC_FS */ #else /* !CONFIG_SND_PROC_FS */
#define snd_hwdep_proc_init() #define snd_hwdep_proc_init()
#define snd_hwdep_proc_done() #define snd_hwdep_proc_done()
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */
/* /*

8
sound/core/init.c
View File

@ -100,7 +100,7 @@ int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int free_flag);
EXPORT_SYMBOL(snd_mixer_oss_notify_callback); EXPORT_SYMBOL(snd_mixer_oss_notify_callback);
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static void snd_card_id_read(struct snd_info_entry *entry, static void snd_card_id_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
{ {
@ -122,7 +122,7 @@ static int init_info_for_card(struct snd_card *card)
return snd_info_card_register(card); return snd_info_card_register(card);
} }
#else /* !CONFIG_PROC_FS */ #else /* !CONFIG_SND_PROC_FS */
#define init_info_for_card(card) #define init_info_for_card(card)
#endif #endif
@ -776,7 +776,7 @@ int snd_card_register(struct snd_card *card)
EXPORT_SYMBOL(snd_card_register); EXPORT_SYMBOL(snd_card_register);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static void snd_card_info_read(struct snd_info_entry *entry, static void snd_card_info_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
{ {
@ -861,7 +861,7 @@ int __init snd_card_info_init(void)
return 0; return 0;
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */
/** /**
* snd_component_add - add a component string * snd_component_add - add a component string

6
sound/core/oss/mixer_oss.c
View File

@ -1111,7 +1111,7 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix
return 0; return 0;
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
*/ */
#define MIXER_VOL(name) [SOUND_MIXER_##name] = #name #define MIXER_VOL(name) [SOUND_MIXER_##name] = #name
@ -1255,10 +1255,10 @@ static void snd_mixer_oss_proc_done(struct snd_mixer_oss *mixer)
snd_info_free_entry(mixer->proc_entry); snd_info_free_entry(mixer->proc_entry);
mixer->proc_entry = NULL; mixer->proc_entry = NULL;
} }
#else /* !CONFIG_PROC_FS */ #else /* !CONFIG_SND_PROC_FS */
#define snd_mixer_oss_proc_init(mix) #define snd_mixer_oss_proc_init(mix)
#define snd_mixer_oss_proc_done(mix) #define snd_mixer_oss_proc_done(mix)
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */
static void snd_mixer_oss_build(struct snd_mixer_oss *mixer) static void snd_mixer_oss_build(struct snd_mixer_oss *mixer)
{ {

6
sound/core/pcm.c
View File

@ -1181,7 +1181,7 @@ int snd_pcm_notify(struct snd_pcm_notify *notify, int nfree)
} }
EXPORT_SYMBOL(snd_pcm_notify); EXPORT_SYMBOL(snd_pcm_notify);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* Info interface * Info interface
*/ */
@ -1227,10 +1227,10 @@ static void snd_pcm_proc_done(void)
snd_info_free_entry(snd_pcm_proc_entry); snd_info_free_entry(snd_pcm_proc_entry);
} }
#else /* !CONFIG_PROC_FS */ #else /* !CONFIG_SND_PROC_FS */
#define snd_pcm_proc_init() #define snd_pcm_proc_init()
#define snd_pcm_proc_done() #define snd_pcm_proc_done()
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */
/* /*

6
sound/core/seq/oss/seq_oss.c
View File

@ -45,7 +45,7 @@ MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MUSIC);
*/ */
static int register_device(void); static int register_device(void);
static void unregister_device(void); static void unregister_device(void);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static int register_proc(void); static int register_proc(void);
static void unregister_proc(void); static void unregister_proc(void);
#else #else
@ -261,7 +261,7 @@ unregister_device(void)
* /proc interface * /proc interface
*/ */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static struct snd_info_entry *info_entry; static struct snd_info_entry *info_entry;
@ -303,4 +303,4 @@ unregister_proc(void)
snd_info_free_entry(info_entry); snd_info_free_entry(info_entry);
info_entry = NULL; info_entry = NULL;
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

5
sound/core/seq/oss/seq_oss_init.c
View File

@ -479,8 +479,7 @@ snd_seq_oss_reset(struct seq_oss_devinfo *dp)
snd_seq_oss_timer_stop(dp->timer); snd_seq_oss_timer_stop(dp->timer);
} }
#ifdef CONFIG_SND_PROC_FS
#ifdef CONFIG_PROC_FS
/* /*
* misc. functions for proc interface * misc. functions for proc interface
*/ */
@ -531,4 +530,4 @@ snd_seq_oss_system_info_read(struct snd_info_buffer *buf)
snd_seq_oss_readq_info_read(dp->readq, buf); snd_seq_oss_readq_info_read(dp->readq, buf);
} }
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

4
sound/core/seq/oss/seq_oss_midi.c
View File

@ -665,7 +665,7 @@ snd_seq_oss_midi_make_info(struct seq_oss_devinfo *dp, int dev, struct midi_info
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* proc interface * proc interface
*/ */
@ -705,4 +705,4 @@ snd_seq_oss_midi_info_read(struct snd_info_buffer *buf)
snd_use_lock_free(&mdev->use_lock); snd_use_lock_free(&mdev->use_lock);
} }
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

4
sound/core/seq/oss/seq_oss_readq.c
View File

@ -222,7 +222,7 @@ snd_seq_oss_readq_put_timestamp(struct seq_oss_readq *q, unsigned long curt, int
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* proc interface * proc interface
*/ */
@ -233,4 +233,4 @@ snd_seq_oss_readq_info_read(struct seq_oss_readq *q, struct snd_info_buffer *buf
(waitqueue_active(&q->midi_sleep) ? "sleeping":"running"), (waitqueue_active(&q->midi_sleep) ? "sleeping":"running"),
q->qlen, q->input_time); q->qlen, q->input_time);
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

4
sound/core/seq/oss/seq_oss_synth.c
View File

@ -630,7 +630,7 @@ snd_seq_oss_synth_make_info(struct seq_oss_devinfo *dp, int dev, struct synth_in
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* proc interface * proc interface
*/ */
@ -658,4 +658,4 @@ snd_seq_oss_synth_info_read(struct snd_info_buffer *buf)
snd_use_lock_free(&rec->use_lock); snd_use_lock_free(&rec->use_lock);
} }
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

4
sound/core/seq/seq_clientmgr.c
View File

@ -2447,7 +2447,7 @@ EXPORT_SYMBOL(snd_seq_kernel_client_write_poll);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* /proc interface * /proc interface
*/ */
@ -2549,7 +2549,7 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry,
snd_seq_client_unlock(client); snd_seq_client_unlock(client);
} }
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
sound/core/seq/seq_device.c
View File

@ -72,7 +72,7 @@ static struct bus_type snd_seq_bus_type = {
/* /*
* proc interface -- just for compatibility * proc interface -- just for compatibility
*/ */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static struct snd_info_entry *info_entry; static struct snd_info_entry *info_entry;
static int print_dev_info(struct device *dev, void *data) static int print_dev_info(struct device *dev, void *data)

2
sound/core/seq/seq_info.h
View File

@ -29,7 +29,7 @@ void snd_seq_info_timer_read(struct snd_info_entry *entry, struct snd_info_buffe
void snd_seq_info_queues_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer); void snd_seq_info_queues_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
int snd_seq_info_init( void ); int snd_seq_info_init( void );
int snd_seq_info_done( void ); int snd_seq_info_done( void );
#else #else

4
sound/core/seq/seq_queue.c
View File

@ -753,7 +753,7 @@ int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop)
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* exported to seq_info.c */ /* exported to seq_info.c */
void snd_seq_info_queues_read(struct snd_info_entry *entry, void snd_seq_info_queues_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
@ -787,5 +787,5 @@ void snd_seq_info_queues_read(struct snd_info_entry *entry,
queuefree(q); queuefree(q);
} }
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

4
sound/core/seq/seq_timer.c
View File

@ -422,7 +422,7 @@ snd_seq_tick_time_t snd_seq_timer_get_cur_tick(struct snd_seq_timer *tmr)
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* exported to seq_info.c */ /* exported to seq_info.c */
void snd_seq_info_timer_read(struct snd_info_entry *entry, void snd_seq_info_timer_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
@ -449,5 +449,5 @@ void snd_seq_info_timer_read(struct snd_info_entry *entry,
queuefree(q); queuefree(q);
} }
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

4
sound/core/sound.c
View File

@ -330,7 +330,7 @@ int snd_unregister_device(struct device *dev)
} }
EXPORT_SYMBOL(snd_unregister_device); EXPORT_SYMBOL(snd_unregister_device);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* INFO PART * INFO PART
*/ */
@ -391,7 +391,7 @@ int __init snd_minor_info_init(void)
entry->c.text.read = snd_minor_info_read; entry->c.text.read = snd_minor_info_read;
return snd_info_register(entry); /* freed in error path */ return snd_info_register(entry); /* freed in error path */
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */
/* /*
* INIT PART * INIT PART

4
sound/core/sound_oss.c
View File

@ -207,7 +207,7 @@ EXPORT_SYMBOL(snd_unregister_oss_device);
* INFO PART * INFO PART
*/ */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static const char *snd_oss_device_type_name(int type) static const char *snd_oss_device_type_name(int type)
{ {
switch (type) { switch (type) {
@ -259,4 +259,4 @@ int __init snd_minor_info_oss_init(void)
entry->c.text.read = snd_minor_info_oss_read; entry->c.text.read = snd_minor_info_oss_read;
return snd_info_register(entry); /* freed in error path */ return snd_info_register(entry); /* freed in error path */
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */

4
sound/core/timer.c
View File

@ -1034,7 +1034,7 @@ static int snd_timer_register_system(void)
return snd_timer_global_register(timer); return snd_timer_global_register(timer);
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
/* /*
* Info interface * Info interface
*/ */
@ -1104,7 +1104,7 @@ static void __exit snd_timer_proc_done(void)
{ {
snd_info_free_entry(snd_timer_proc_entry); snd_info_free_entry(snd_timer_proc_entry);
} }
#else /* !CONFIG_PROC_FS */ #else /* !CONFIG_SND_PROC_FS */
#define snd_timer_proc_init() #define snd_timer_proc_init()
#define snd_timer_proc_done() #define snd_timer_proc_done()
#endif #endif

3
sound/pci/hda/Makefile
View File

@ -3,7 +3,8 @@ snd-hda-tegra-objs := hda_tegra.o
snd-hda-codec-y := hda_bind.o hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o snd-hda-codec-y := hda_bind.o hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o
snd-hda-codec-y += hda_controller.o snd-hda-codec-y += hda_controller.o
snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o snd-hda-codec-$(CONFIG_SND_PROC_FS) += hda_proc.o
snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o

4
sound/pci/hda/hda_eld.c
View File

@ -448,7 +448,7 @@ void snd_hdmi_show_eld(struct hda_codec *codec, struct parsed_hdmi_eld *e)
hdmi_show_short_audio_desc(codec, e->sad + i); hdmi_show_short_audio_desc(codec, e->sad + i);
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static void hdmi_print_sad_info(int i, struct cea_sad *a, static void hdmi_print_sad_info(int i, struct cea_sad *a,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
@ -586,7 +586,7 @@ void snd_hdmi_write_eld_info(struct hdmi_eld *eld,
} }
} }
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */
/* update PCM info based on ELD */ /* update PCM info based on ELD */
void snd_hdmi_eld_update_pcm_info(struct parsed_hdmi_eld *e, void snd_hdmi_eld_update_pcm_info(struct parsed_hdmi_eld *e,

4
sound/pci/hda/hda_local.h
View File

@ -330,7 +330,7 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
/* /*
* generic proc interface * generic proc interface
*/ */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
int snd_hda_codec_proc_new(struct hda_codec *codec); int snd_hda_codec_proc_new(struct hda_codec *codec);
#else #else
static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; } static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }
@ -777,7 +777,7 @@ int snd_hdmi_get_eld_ati(struct hda_codec *codec, hda_nid_t nid,
unsigned char *buf, int *eld_size, unsigned char *buf, int *eld_size,
bool rev3_or_later); bool rev3_or_later);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
void snd_hdmi_print_eld_info(struct hdmi_eld *eld, void snd_hdmi_print_eld_info(struct hdmi_eld *eld,
struct snd_info_buffer *buffer); struct snd_info_buffer *buffer);
void snd_hdmi_write_eld_info(struct hdmi_eld *eld, void snd_hdmi_write_eld_info(struct hdmi_eld *eld,

4
sound/pci/hda/patch_hdmi.c
View File

@ -86,7 +86,7 @@ struct hdmi_spec_per_pin {
bool non_pcm; bool non_pcm;
bool chmap_set; /* channel-map override by ALSA API? */ bool chmap_set; /* channel-map override by ALSA API? */
unsigned char chmap[8]; /* ALSA API channel-map */ unsigned char chmap[8]; /* ALSA API channel-map */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
struct snd_info_entry *proc_entry; struct snd_info_entry *proc_entry;
#endif #endif
}; };
@ -548,7 +548,7 @@ static void hdmi_set_channel_count(struct hda_codec *codec,
* ELD proc files * ELD proc files
*/ */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static void print_eld_info(struct snd_info_entry *entry, static void print_eld_info(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
{ {

2
sound/pci/hda/patch_sigmatel.c
View File

@ -4337,7 +4337,7 @@ static void stac_shutup(struct hda_codec *codec)
#define stac_free snd_hda_gen_free #define stac_free snd_hda_gen_free
#ifdef CONFIG_PROC_FS #ifdef CONFIG_SND_PROC_FS
static void stac92hd_proc_hook(struct snd_info_buffer *buffer, static void stac92hd_proc_hook(struct snd_info_buffer *buffer,
struct hda_codec *codec, hda_nid_t nid) struct hda_codec *codec, hda_nid_t nid)
{ {