diff options
| -rw-r--r-- | sound/oss/ad1816.c | 2 | ||||
| -rw-r--r-- | sound/oss/nm256.h | 2 | ||||
| -rw-r--r-- | sound/oss/nm256_audio.c | 4 | ||||
| -rw-r--r-- | sound/oss/nm256_coeff.h | 2 | ||||
| -rw-r--r-- | sound/oss/v_midi.c | 2 | ||||
| -rw-r--r-- | sound/oss/wavfront.c | 12 |
6 files changed, 11 insertions, 13 deletions
diff --git a/sound/oss/ad1816.c b/sound/oss/ad1816.c index 22dae5d0fda..95586de0202 100644 --- a/sound/oss/ad1816.c +++ b/sound/oss/ad1816.c @@ -592,7 +592,7 @@ typedef struct mixer_def mixer_ent; {{reg_l, pola_l, pos_l, len_l}, {reg_r, pola_r, pos_r, len_r}} -mixer_ent mix_devices[SOUND_MIXER_NRDEVICES][2] = { +static mixer_ent mix_devices[SOUND_MIXER_NRDEVICES][2] = { MIX_ENT(SOUND_MIXER_VOLUME, 14, 1, 8, 5, 14, 1, 0, 5), MIX_ENT(SOUND_MIXER_BASS, 0, 0, 0, 0, 0, 0, 0, 0), MIX_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 eae7d99d682..76233176532 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, } /* Returns a non-zero value if we should use the coefficient cache. */ -extern int nm256_cachedCoefficients (struct nm256_info *card); +static int nm256_cachedCoefficients (struct nm256_info *card); #endif diff --git a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c index f9166e13519..f1a7ba6ae34 100644 --- a/sound/oss/nm256_audio.c +++ b/sound/oss/nm256_audio.c @@ -31,7 +31,7 @@ #include "nm256.h" #include "nm256_coeff.h" -int nm256_debug; +static int nm256_debug; static int force_load; /* @@ -138,7 +138,7 @@ static int usecache; static int buffertop; /* Check to see if we're using the bank of cached coefficients. */ -int +static int nm256_cachedCoefficients (struct nm256_info *card) { return usecache; diff --git a/sound/oss/nm256_coeff.h b/sound/oss/nm256_coeff.h index 0ceecc20077..6fc07f3cb33 100644 --- a/sound/oss/nm256_coeff.h +++ b/sound/oss/nm256_coeff.h @@ -4650,7 +4650,7 @@ nm256_loadAllCoefficients (struct nm256_info *card) card->coeffsCurrent = 1; } -void +static void nm256_loadCoefficient (struct nm256_info *card, int which, int number) { static u16 addrs[3] = { 0x1c, 0x21c, 0x408 }; diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c index 077b7679766..a7ef04fab07 100644 --- a/sound/oss/v_midi.c +++ b/sound/oss/v_midi.c @@ -39,8 +39,6 @@ static void *midi_mem = NULL; */ -void (*midi_input_intr) (int dev, unsigned char data); - static int v_midi_open (int dev, int mode, void (*input) (int dev, unsigned char data), void (*output) (int dev) diff --git a/sound/oss/wavfront.c b/sound/oss/wavfront.c index cce1278dc48..b92ba892163 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, /*** Module-accessible parameters ***************************************/ -int wf_raw; /* we normally check for "raw state" to firmware - loading. if set, then during driver loading, the - state of the board is ignored, and we reset the - board and load the firmware anyway. - */ +static int wf_raw; /* we normally check for "raw state" to firmware + loading. if set, then during driver loading, the + state of the board is ignored, and we reset the + board and load the firmware anyway. + */ static int fx_raw = 1; /* if this is zero, we'll leave the FX processor in whatever state it is when the driver is loaded. @@ -2911,7 +2911,7 @@ int __init detect_wffx (void) return 0; } -void +static void wffx_mute (int onoff) { |