提交 155542c2 编写于 作者: A Adrian Bunk 提交者: Linus Torvalds

[PATCH] sound/oss/: cleanups

This patch contains cleanups including the following:
- make needlessly global code static
Signed-off-by: NAdrian Bunk <bunk@stusta.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 4b849727
...@@ -592,7 +592,7 @@ typedef struct mixer_def mixer_ent; ...@@ -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}} {{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_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_BASS, 0, 0, 0, 0, 0, 0, 0, 0),
MIX_ENT(SOUND_MIXER_TREBLE, 0, 0, 0, 0, 0, 0, 0, 0), MIX_ENT(SOUND_MIXER_TREBLE, 0, 0, 0, 0, 0, 0, 0, 0),
......
...@@ -284,7 +284,7 @@ nm256_readBuffer8 (struct nm256_info *card, u8 *dst, int port, int offset, ...@@ -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. */ /* 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 #endif
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "nm256.h" #include "nm256.h"
#include "nm256_coeff.h" #include "nm256_coeff.h"
int nm256_debug; static int nm256_debug;
static int force_load; static int force_load;
/* /*
...@@ -138,7 +138,7 @@ static int usecache; ...@@ -138,7 +138,7 @@ static int usecache;
static int buffertop; static int buffertop;
/* Check to see if we're using the bank of cached coefficients. */ /* Check to see if we're using the bank of cached coefficients. */
int static int
nm256_cachedCoefficients (struct nm256_info *card) nm256_cachedCoefficients (struct nm256_info *card)
{ {
return usecache; return usecache;
......
...@@ -4650,7 +4650,7 @@ nm256_loadAllCoefficients (struct nm256_info *card) ...@@ -4650,7 +4650,7 @@ nm256_loadAllCoefficients (struct nm256_info *card)
card->coeffsCurrent = 1; card->coeffsCurrent = 1;
} }
void static void
nm256_loadCoefficient (struct nm256_info *card, int which, int number) nm256_loadCoefficient (struct nm256_info *card, int which, int number)
{ {
static u16 addrs[3] = { 0x1c, 0x21c, 0x408 }; static u16 addrs[3] = { 0x1c, 0x21c, 0x408 };
......
...@@ -39,8 +39,6 @@ static void *midi_mem = NULL; ...@@ -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, static int v_midi_open (int dev, int mode,
void (*input) (int dev, unsigned char data), void (*input) (int dev, unsigned char data),
void (*output) (int dev) void (*output) (int dev)
......
...@@ -151,11 +151,11 @@ static int (*midi_load_patch) (int devno, int format, const char __user *addr, ...@@ -151,11 +151,11 @@ static int (*midi_load_patch) (int devno, int format, const char __user *addr,
/*** Module-accessible parameters ***************************************/ /*** Module-accessible parameters ***************************************/
int wf_raw; /* we normally check for "raw state" to firmware static int wf_raw; /* we normally check for "raw state" to firmware
loading. if set, then during driver loading, the loading. if set, then during driver loading, the
state of the board is ignored, and we reset the state of the board is ignored, and we reset the
board and load the firmware anyway. board and load the firmware anyway.
*/ */
static int fx_raw = 1; /* if this is zero, we'll leave the FX processor in 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. whatever state it is when the driver is loaded.
...@@ -2911,7 +2911,7 @@ int __init detect_wffx (void) ...@@ -2911,7 +2911,7 @@ int __init detect_wffx (void)
return 0; return 0;
} }
void static void
wffx_mute (int onoff) wffx_mute (int onoff)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册