aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-06-25 17:58:53 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:25:01 -0400
commit155542c271ba76fec37146b26aea1001019eb60d (patch)
tree97f65fb08d8c10bdcc064a722e6d4cae290fa084
parent4b8497276a96928bcb5947cc44e61f8b69fe66ac (diff)
[PATCH] sound/oss/: cleanups
This patch contains cleanups including the following: - make needlessly global code static Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--sound/oss/ad1816.c2
-rw-r--r--sound/oss/nm256.h2
-rw-r--r--sound/oss/nm256_audio.c4
-rw-r--r--sound/oss/nm256_coeff.h2
-rw-r--r--sound/oss/v_midi.c2
-rw-r--r--sound/oss/wavfront.c12
6 files changed, 11 insertions, 13 deletions
diff --git a/sound/oss/ad1816.c b/sound/oss/ad1816.c
index 22dae5d0fda3..95586de02028 100644
--- a/sound/oss/ad1816.c
+++ b/sound/oss/ad1816.c
@@ -592,7 +592,7 @@ typedef struct mixer_def mixer_ent;
592 {{reg_l, pola_l, pos_l, len_l}, {reg_r, pola_r, pos_r, len_r}} 592 {{reg_l, pola_l, pos_l, len_l}, {reg_r, pola_r, pos_r, len_r}}
593 593
594 594
595mixer_ent mix_devices[SOUND_MIXER_NRDEVICES][2] = { 595static mixer_ent mix_devices[SOUND_MIXER_NRDEVICES][2] = {
596MIX_ENT(SOUND_MIXER_VOLUME, 14, 1, 8, 5, 14, 1, 0, 5), 596MIX_ENT(SOUND_MIXER_VOLUME, 14, 1, 8, 5, 14, 1, 0, 5),
597MIX_ENT(SOUND_MIXER_BASS, 0, 0, 0, 0, 0, 0, 0, 0), 597MIX_ENT(SOUND_MIXER_BASS, 0, 0, 0, 0, 0, 0, 0, 0),
598MIX_ENT(SOUND_MIXER_TREBLE, 0, 0, 0, 0, 0, 0, 0, 0), 598MIX_ENT(SOUND_MIXER_TREBLE, 0, 0, 0, 0, 0, 0, 0, 0),
diff --git a/sound/oss/nm256.h b/sound/oss/nm256.h
index eae7d99d6826..762331765328 100644
--- a/sound/oss/nm256.h
+++ b/sound/oss/nm256.h
@@ -284,7 +284,7 @@ nm256_readBuffer8 (struct nm256_info *card, u8 *dst, int port, int offset,
284} 284}
285 285
286/* Returns a non-zero value if we should use the coefficient cache. */ 286/* Returns a non-zero value if we should use the coefficient cache. */
287extern int nm256_cachedCoefficients (struct nm256_info *card); 287static int nm256_cachedCoefficients (struct nm256_info *card);
288 288
289#endif 289#endif
290 290
diff --git a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c
index f9166e135192..f1a7ba6ae340 100644
--- a/sound/oss/nm256_audio.c
+++ b/sound/oss/nm256_audio.c
@@ -31,7 +31,7 @@
31#include "nm256.h" 31#include "nm256.h"
32#include "nm256_coeff.h" 32#include "nm256_coeff.h"
33 33
34int nm256_debug; 34static int nm256_debug;
35static int force_load; 35static int force_load;
36 36
37/* 37/*
@@ -138,7 +138,7 @@ static int usecache;
138static int buffertop; 138static int buffertop;
139 139
140/* Check to see if we're using the bank of cached coefficients. */ 140/* Check to see if we're using the bank of cached coefficients. */
141int 141static int
142nm256_cachedCoefficients (struct nm256_info *card) 142nm256_cachedCoefficients (struct nm256_info *card)
143{ 143{
144 return usecache; 144 return usecache;
diff --git a/sound/oss/nm256_coeff.h b/sound/oss/nm256_coeff.h
index 0ceecc20077b..6fc07f3cb33b 100644
--- a/sound/oss/nm256_coeff.h
+++ b/sound/oss/nm256_coeff.h
@@ -4650,7 +4650,7 @@ nm256_loadAllCoefficients (struct nm256_info *card)
4650 card->coeffsCurrent = 1; 4650 card->coeffsCurrent = 1;
4651} 4651}
4652 4652
4653void 4653static void
4654nm256_loadCoefficient (struct nm256_info *card, int which, int number) 4654nm256_loadCoefficient (struct nm256_info *card, int which, int number)
4655{ 4655{
4656 static u16 addrs[3] = { 0x1c, 0x21c, 0x408 }; 4656 static u16 addrs[3] = { 0x1c, 0x21c, 0x408 };
diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index 077b76797665..a7ef04fab075 100644
--- a/sound/oss/v_midi.c
+++ b/sound/oss/v_midi.c
@@ -39,8 +39,6 @@ static void *midi_mem = NULL;
39 */ 39 */
40 40
41 41
42void (*midi_input_intr) (int dev, unsigned char data);
43
44static int v_midi_open (int dev, int mode, 42static int v_midi_open (int dev, int mode,
45 void (*input) (int dev, unsigned char data), 43 void (*input) (int dev, unsigned char data),
46 void (*output) (int dev) 44 void (*output) (int dev)
diff --git a/sound/oss/wavfront.c b/sound/oss/wavfront.c
index cce1278dc487..b92ba8921638 100644
--- a/sound/oss/wavfront.c
+++ b/sound/oss/wavfront.c
@@ -151,11 +151,11 @@ static int (*midi_load_patch) (int devno, int format, const char __user *addr,
151 151
152/*** Module-accessible parameters ***************************************/ 152/*** Module-accessible parameters ***************************************/
153 153
154int wf_raw; /* we normally check for "raw state" to firmware 154static int wf_raw; /* we normally check for "raw state" to firmware
155 loading. if set, then during driver loading, the 155 loading. if set, then during driver loading, the
156 state of the board is ignored, and we reset the 156 state of the board is ignored, and we reset the
157 board and load the firmware anyway. 157 board and load the firmware anyway.
158 */ 158 */
159 159
160static int fx_raw = 1; /* if this is zero, we'll leave the FX processor in 160static int fx_raw = 1; /* if this is zero, we'll leave the FX processor in
161 whatever state it is when the driver is loaded. 161 whatever state it is when the driver is loaded.
@@ -2911,7 +2911,7 @@ int __init detect_wffx (void)
2911 return 0; 2911 return 0;
2912} 2912}
2913 2913
2914void 2914static void
2915wffx_mute (int onoff) 2915wffx_mute (int onoff)
2916 2916
2917{ 2917{