Commit a53fc188ec6fc406276799da465fe789c40d96b2

Authored by Clemens Ladisch
Committed by Jaroslav Kysela
1 parent b65f824c1e

[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: Clemens Ladisch <clemens@ladisch.de>

Showing 7 changed files with 16 additions and 14 deletions Side-by-side Diff

sound/core/memalloc.c
... ... @@ -512,7 +512,7 @@
512 512 * proc file interface
513 513 */
514 514 #define SND_MEM_PROC_FILE "driver/snd-page-alloc"
515   -struct proc_dir_entry *snd_mem_proc;
  515 +static struct proc_dir_entry *snd_mem_proc;
516 516  
517 517 static int snd_mem_proc_read(char *page, char **start, off_t off,
518 518 int count, int *eof, void *data)
sound/core/pcm_lib.c
... ... @@ -1584,8 +1584,8 @@
1584 1584 return snd_pcm_hw_param_value(params, var, NULL);
1585 1585 }
1586 1586  
1587   -int _snd_pcm_hw_param_mask(snd_pcm_hw_params_t *params,
1588   - snd_pcm_hw_param_t var, const snd_mask_t *val)
  1587 +static int _snd_pcm_hw_param_mask(snd_pcm_hw_params_t *params,
  1588 + snd_pcm_hw_param_t var, const snd_mask_t *val)
1589 1589 {
1590 1590 int changed;
1591 1591 assert(hw_is_mask(var));
... ... @@ -799,13 +799,13 @@
799 799 return 0;
800 800 }
801 801  
802   -int snd_timer_dev_free(snd_device_t *device)
  802 +static int snd_timer_dev_free(snd_device_t *device)
803 803 {
804 804 snd_timer_t *timer = device->device_data;
805 805 return snd_timer_free(timer);
806 806 }
807 807  
808   -int snd_timer_dev_register(snd_device_t *dev)
  808 +static int snd_timer_dev_register(snd_device_t *dev)
809 809 {
810 810 snd_timer_t *timer = dev->device_data;
811 811 snd_timer_t *timer1;
sound/isa/gus/gus_io.c
... ... @@ -269,8 +269,9 @@
269 269  
270 270 #endif /* 0 */
271 271  
272   -unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus,
273   - unsigned char reg, short w_16bit)
  272 +#ifdef CONFIG_SND_DEBUG
  273 +static unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus,
  274 + unsigned char reg, short w_16bit)
274 275 {
275 276 unsigned int res;
276 277 unsigned long flags;
... ... @@ -280,6 +281,7 @@
280 281 spin_unlock_irqrestore(&gus->reg_lock, flags);
281 282 return res;
282 283 }
  284 +#endif
283 285  
284 286 /*
285 287  
sound/pci/ac97/ac97_patch.c
... ... @@ -375,7 +375,7 @@
375 375 AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1),
376 376 };
377 377  
378   -int patch_wolfson_wm9703_specific(ac97_t * ac97)
  378 +static int patch_wolfson_wm9703_specific(ac97_t * ac97)
379 379 {
380 380 /* This is known to work for the ViewSonic ViewPad 1000
381 381 * Randolph Bentson <bentson@holmsjoen.com>
... ... @@ -410,7 +410,7 @@
410 410 AC97_DOUBLE("Surround Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1),
411 411 };
412 412  
413   -int patch_wolfson_wm9704_specific(ac97_t * ac97)
  413 +static int patch_wolfson_wm9704_specific(ac97_t * ac97)
414 414 {
415 415 int err, i;
416 416 for (i = 0; i < ARRAY_SIZE(wm9704_snd_ac97_controls); i++) {
... ... @@ -433,7 +433,7 @@
433 433 return 0;
434 434 }
435 435  
436   -int patch_wolfson_wm9705_specific(ac97_t * ac97)
  436 +static int patch_wolfson_wm9705_specific(ac97_t * ac97)
437 437 {
438 438 int err, i;
439 439 for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) {
... ... @@ -558,7 +558,7 @@
558 558 AC97_SINGLE("Mono ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
559 559 };
560 560  
561   -int patch_wolfson_wm9711_specific(ac97_t * ac97)
  561 +static int patch_wolfson_wm9711_specific(ac97_t * ac97)
562 562 {
563 563 int err, i;
564 564  
sound/pci/ali5451/ali5451.c
... ... @@ -1842,7 +1842,7 @@
1842 1842 return 0;
1843 1843 }
1844 1844  
1845   -struct ali_pcm_description ali_pcms[] = {
  1845 +static struct ali_pcm_description ali_pcms[] = {
1846 1846 { "ALI 5451", ALI_CHANNELS, 1, &snd_ali_playback_ops, &snd_ali_capture_ops },
1847 1847 { "ALI 5451 modem", 1, 1, &snd_ali_modem_playback_ops, &snd_ali_modem_capture_ops }
1848 1848 };
sound/pci/rme9652/hdspm.c
... ... @@ -1104,14 +1104,14 @@
1104 1104 return 0;
1105 1105 }
1106 1106  
1107   -snd_rawmidi_ops_t snd_hdspm_midi_output =
  1107 +static snd_rawmidi_ops_t snd_hdspm_midi_output =
1108 1108 {
1109 1109 .open = snd_hdspm_midi_output_open,
1110 1110 .close = snd_hdspm_midi_output_close,
1111 1111 .trigger = snd_hdspm_midi_output_trigger,
1112 1112 };
1113 1113  
1114   -snd_rawmidi_ops_t snd_hdspm_midi_input =
  1114 +static snd_rawmidi_ops_t snd_hdspm_midi_input =
1115 1115 {
1116 1116 .open = snd_hdspm_midi_input_open,
1117 1117 .close = snd_hdspm_midi_input_close,