浏览代码

sound: sound/oss/dmasound/: cleanups

This patch contains the following cleanups:
- make the following needlessly global functions static:
  - dmasound_core.c: get_afmt_string()
  - dmasound_paula.c: dmasound_paula_init()
  - dmasound_q40.c: dmasound_q40_init()
- remove the following unused global variable:
  - dmasound_core.c: software_input_volume

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Adrian Bunk 17 年之前
父节点
当前提交
0a1b42db4b
共有 3 个文件被更改,包括 3 次插入8 次删除
  1. 1 6
      sound/oss/dmasound/dmasound_core.c
  2. 1 1
      sound/oss/dmasound/dmasound_paula.c
  3. 1 1
      sound/oss/dmasound/dmasound_q40.c

+ 1 - 6
sound/oss/dmasound/dmasound_core.c

@@ -211,10 +211,6 @@ static int state_unit = -1;
 static int irq_installed;
 static int irq_installed;
 #endif /* MODULE */
 #endif /* MODULE */
 
 
-/* software implemented recording volume! */
-uint software_input_volume = SW_INPUT_VOLUME_SCALE * SW_INPUT_VOLUME_DEFAULT;
-EXPORT_SYMBOL(software_input_volume);
-
 /* control over who can modify resources shared between play/record */
 /* control over who can modify resources shared between play/record */
 static mode_t shared_resource_owner;
 static mode_t shared_resource_owner;
 static int shared_resources_initialised;
 static int shared_resources_initialised;
@@ -1188,7 +1184,7 @@ static struct {
 
 
 /* publish this function for use by low-level code, if required */
 /* publish this function for use by low-level code, if required */
 
 
-char *get_afmt_string(int afmt)
+static char *get_afmt_string(int afmt)
 {
 {
         switch(afmt) {
         switch(afmt) {
             case AFMT_MU_LAW:
             case AFMT_MU_LAW:
@@ -1551,4 +1547,3 @@ EXPORT_SYMBOL(dmasound_catchRadius);
 EXPORT_SYMBOL(dmasound_ulaw2dma8);
 EXPORT_SYMBOL(dmasound_ulaw2dma8);
 EXPORT_SYMBOL(dmasound_alaw2dma8);
 EXPORT_SYMBOL(dmasound_alaw2dma8);
 #endif
 #endif
-EXPORT_SYMBOL(get_afmt_string) ;

+ 1 - 1
sound/oss/dmasound/dmasound_paula.c

@@ -710,7 +710,7 @@ static MACHINE machAmiga = {
 /*** Config & Setup **********************************************************/
 /*** Config & Setup **********************************************************/
 
 
 
 
-int __init dmasound_paula_init(void)
+static int __init dmasound_paula_init(void)
 {
 {
 	int err;
 	int err;
 
 

+ 1 - 1
sound/oss/dmasound/dmasound_q40.c

@@ -611,7 +611,7 @@ static MACHINE machQ40 = {
 /*** Config & Setup **********************************************************/
 /*** Config & Setup **********************************************************/
 
 
 
 
-int __init dmasound_q40_init(void)
+static int __init dmasound_q40_init(void)
 {
 {
 	if (MACH_IS_Q40) {
 	if (MACH_IS_Q40) {
 	    dmasound.mach = machQ40;
 	    dmasound.mach = machQ40;