aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-06-09 18:26:28 -0400
committerJaroslav Kysela <perex@perex.cz>2008-06-13 10:29:50 -0400
commit0a1b42db4bf9db233d1f29795086a9526e84c845 (patch)
tree7eb6e648022763f9ec3a7a18655ca3dda3ecab81
parent781711a93e8aae756e8ae07acef185a6dfe552b8 (diff)
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>
-rw-r--r--sound/oss/dmasound/dmasound_core.c7
-rw-r--r--sound/oss/dmasound/dmasound_paula.c2
-rw-r--r--sound/oss/dmasound/dmasound_q40.c2
3 files changed, 3 insertions, 8 deletions
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index a003c0ea9303..95fc5c681755 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -211,10 +211,6 @@ static int state_unit = -1;
211static int irq_installed; 211static int irq_installed;
212#endif /* MODULE */ 212#endif /* MODULE */
213 213
214/* software implemented recording volume! */
215uint software_input_volume = SW_INPUT_VOLUME_SCALE * SW_INPUT_VOLUME_DEFAULT;
216EXPORT_SYMBOL(software_input_volume);
217
218/* control over who can modify resources shared between play/record */ 214/* control over who can modify resources shared between play/record */
219static mode_t shared_resource_owner; 215static mode_t shared_resource_owner;
220static int shared_resources_initialised; 216static int shared_resources_initialised;
@@ -1188,7 +1184,7 @@ static struct {
1188 1184
1189/* publish this function for use by low-level code, if required */ 1185/* publish this function for use by low-level code, if required */
1190 1186
1191char *get_afmt_string(int afmt) 1187static char *get_afmt_string(int afmt)
1192{ 1188{
1193 switch(afmt) { 1189 switch(afmt) {
1194 case AFMT_MU_LAW: 1190 case AFMT_MU_LAW:
@@ -1551,4 +1547,3 @@ EXPORT_SYMBOL(dmasound_catchRadius);
1551EXPORT_SYMBOL(dmasound_ulaw2dma8); 1547EXPORT_SYMBOL(dmasound_ulaw2dma8);
1552EXPORT_SYMBOL(dmasound_alaw2dma8); 1548EXPORT_SYMBOL(dmasound_alaw2dma8);
1553#endif 1549#endif
1554EXPORT_SYMBOL(get_afmt_string) ;
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index 202e8103dc4d..06e9e88e4c05 100644
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -710,7 +710,7 @@ static MACHINE machAmiga = {
710/*** Config & Setup **********************************************************/ 710/*** Config & Setup **********************************************************/
711 711
712 712
713int __init dmasound_paula_init(void) 713static int __init dmasound_paula_init(void)
714{ 714{
715 int err; 715 int err;
716 716
diff --git a/sound/oss/dmasound/dmasound_q40.c b/sound/oss/dmasound/dmasound_q40.c
index b3379dd7ca5e..1855b14d90c3 100644
--- a/sound/oss/dmasound/dmasound_q40.c
+++ b/sound/oss/dmasound/dmasound_q40.c
@@ -611,7 +611,7 @@ static MACHINE machQ40 = {
611/*** Config & Setup **********************************************************/ 611/*** Config & Setup **********************************************************/
612 612
613 613
614int __init dmasound_q40_init(void) 614static int __init dmasound_q40_init(void)
615{ 615{
616 if (MACH_IS_Q40) { 616 if (MACH_IS_Q40) {
617 dmasound.mach = machQ40; 617 dmasound.mach = machQ40;