Commit a53fc188 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela

[ALSA] make local objects static

Memalloc module,PCM Midlevel,Timer Midlevel,GUS Library,AC97 Codec
ALI5451 driver,RME9652 driver
Make some functions/variables that are used in only one file static.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent b65f824c
...@@ -512,7 +512,7 @@ static void free_all_reserved_pages(void) ...@@ -512,7 +512,7 @@ static void free_all_reserved_pages(void)
* proc file interface * proc file interface
*/ */
#define SND_MEM_PROC_FILE "driver/snd-page-alloc" #define SND_MEM_PROC_FILE "driver/snd-page-alloc"
struct proc_dir_entry *snd_mem_proc; static struct proc_dir_entry *snd_mem_proc;
static int snd_mem_proc_read(char *page, char **start, off_t off, static int snd_mem_proc_read(char *page, char **start, off_t off,
int count, int *eof, void *data) int count, int *eof, void *data)
......
...@@ -1584,8 +1584,8 @@ int snd_pcm_hw_param_set(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, ...@@ -1584,8 +1584,8 @@ int snd_pcm_hw_param_set(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
return snd_pcm_hw_param_value(params, var, NULL); return snd_pcm_hw_param_value(params, var, NULL);
} }
int _snd_pcm_hw_param_mask(snd_pcm_hw_params_t *params, static int _snd_pcm_hw_param_mask(snd_pcm_hw_params_t *params,
snd_pcm_hw_param_t var, const snd_mask_t *val) snd_pcm_hw_param_t var, const snd_mask_t *val)
{ {
int changed; int changed;
assert(hw_is_mask(var)); assert(hw_is_mask(var));
......
...@@ -799,13 +799,13 @@ static int snd_timer_free(snd_timer_t *timer) ...@@ -799,13 +799,13 @@ static int snd_timer_free(snd_timer_t *timer)
return 0; return 0;
} }
int snd_timer_dev_free(snd_device_t *device) static int snd_timer_dev_free(snd_device_t *device)
{ {
snd_timer_t *timer = device->device_data; snd_timer_t *timer = device->device_data;
return snd_timer_free(timer); return snd_timer_free(timer);
} }
int snd_timer_dev_register(snd_device_t *dev) static int snd_timer_dev_register(snd_device_t *dev)
{ {
snd_timer_t *timer = dev->device_data; snd_timer_t *timer = dev->device_data;
snd_timer_t *timer1; snd_timer_t *timer1;
......
...@@ -269,8 +269,9 @@ void snd_gf1_i_write_addr(snd_gus_card_t * gus, unsigned char reg, ...@@ -269,8 +269,9 @@ void snd_gf1_i_write_addr(snd_gus_card_t * gus, unsigned char reg,
#endif /* 0 */ #endif /* 0 */
unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus, #ifdef CONFIG_SND_DEBUG
unsigned char reg, short w_16bit) static unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus,
unsigned char reg, short w_16bit)
{ {
unsigned int res; unsigned int res;
unsigned long flags; unsigned long flags;
...@@ -280,6 +281,7 @@ unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus, ...@@ -280,6 +281,7 @@ unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus,
spin_unlock_irqrestore(&gus->reg_lock, flags); spin_unlock_irqrestore(&gus->reg_lock, flags);
return res; return res;
} }
#endif
/* /*
......
...@@ -375,7 +375,7 @@ AC97_DOUBLE("Front Playback Volume", AC97_WM97XX_FMIXER_VOL, 8, 0, 31, 1), ...@@ -375,7 +375,7 @@ AC97_DOUBLE("Front Playback Volume", AC97_WM97XX_FMIXER_VOL, 8, 0, 31, 1),
AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1), AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1),
}; };
int patch_wolfson_wm9703_specific(ac97_t * ac97) static int patch_wolfson_wm9703_specific(ac97_t * ac97)
{ {
/* This is known to work for the ViewSonic ViewPad 1000 /* This is known to work for the ViewSonic ViewPad 1000
* Randolph Bentson <bentson@holmsjoen.com> * Randolph Bentson <bentson@holmsjoen.com>
...@@ -410,7 +410,7 @@ AC97_DOUBLE("Rear DAC Volume", AC97_WM9704_RPCM_VOL, 8, 0, 31, 1), ...@@ -410,7 +410,7 @@ AC97_DOUBLE("Rear DAC Volume", AC97_WM9704_RPCM_VOL, 8, 0, 31, 1),
AC97_DOUBLE("Surround Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1), AC97_DOUBLE("Surround Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1),
}; };
int patch_wolfson_wm9704_specific(ac97_t * ac97) static int patch_wolfson_wm9704_specific(ac97_t * ac97)
{ {
int err, i; int err, i;
for (i = 0; i < ARRAY_SIZE(wm9704_snd_ac97_controls); i++) { for (i = 0; i < ARRAY_SIZE(wm9704_snd_ac97_controls); i++) {
...@@ -433,7 +433,7 @@ int patch_wolfson04(ac97_t * ac97) ...@@ -433,7 +433,7 @@ int patch_wolfson04(ac97_t * ac97)
return 0; return 0;
} }
int patch_wolfson_wm9705_specific(ac97_t * ac97) static int patch_wolfson_wm9705_specific(ac97_t * ac97)
{ {
int err, i; int err, i;
for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) { for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) {
...@@ -558,7 +558,7 @@ AC97_SINGLE("Headphone ZC Switch", AC97_HEADPHONE, 7, 1, 0), ...@@ -558,7 +558,7 @@ AC97_SINGLE("Headphone ZC Switch", AC97_HEADPHONE, 7, 1, 0),
AC97_SINGLE("Mono ZC Switch", AC97_MASTER_MONO, 7, 1, 0), AC97_SINGLE("Mono ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
}; };
int patch_wolfson_wm9711_specific(ac97_t * ac97) static int patch_wolfson_wm9711_specific(ac97_t * ac97)
{ {
int err, i; int err, i;
......
...@@ -1842,7 +1842,7 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_descr ...@@ -1842,7 +1842,7 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_descr
return 0; return 0;
} }
struct ali_pcm_description ali_pcms[] = { static struct ali_pcm_description ali_pcms[] = {
{ "ALI 5451", ALI_CHANNELS, 1, &snd_ali_playback_ops, &snd_ali_capture_ops }, { "ALI 5451", ALI_CHANNELS, 1, &snd_ali_playback_ops, &snd_ali_capture_ops },
{ "ALI 5451 modem", 1, 1, &snd_ali_modem_playback_ops, &snd_ali_modem_capture_ops } { "ALI 5451 modem", 1, 1, &snd_ali_modem_playback_ops, &snd_ali_modem_capture_ops }
}; };
......
...@@ -1104,14 +1104,14 @@ static int snd_hdspm_midi_output_close(snd_rawmidi_substream_t * substream) ...@@ -1104,14 +1104,14 @@ static int snd_hdspm_midi_output_close(snd_rawmidi_substream_t * substream)
return 0; return 0;
} }
snd_rawmidi_ops_t snd_hdspm_midi_output = static snd_rawmidi_ops_t snd_hdspm_midi_output =
{ {
.open = snd_hdspm_midi_output_open, .open = snd_hdspm_midi_output_open,
.close = snd_hdspm_midi_output_close, .close = snd_hdspm_midi_output_close,
.trigger = snd_hdspm_midi_output_trigger, .trigger = snd_hdspm_midi_output_trigger,
}; };
snd_rawmidi_ops_t snd_hdspm_midi_input = static snd_rawmidi_ops_t snd_hdspm_midi_input =
{ {
.open = snd_hdspm_midi_input_open, .open = snd_hdspm_midi_input_open,
.close = snd_hdspm_midi_input_close, .close = snd_hdspm_midi_input_close,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment