Skip to content

Commit

Permalink
sound: sound/oss/dmasound/: cleanups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Jaroslav Kysela committed Jun 13, 2008
1 parent 781711a commit 0a1b42d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
7 changes: 1 addition & 6 deletions sound/oss/dmasound/dmasound_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,6 @@ static int state_unit = -1;
static int irq_installed;
#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 */
static mode_t shared_resource_owner;
static int shared_resources_initialised;
Expand Down Expand Up @@ -1188,7 +1184,7 @@ static struct {

/* 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) {
case AFMT_MU_LAW:
Expand Down Expand Up @@ -1551,4 +1547,3 @@ EXPORT_SYMBOL(dmasound_catchRadius);
EXPORT_SYMBOL(dmasound_ulaw2dma8);
EXPORT_SYMBOL(dmasound_alaw2dma8);
#endif
EXPORT_SYMBOL(get_afmt_string) ;
2 changes: 1 addition & 1 deletion sound/oss/dmasound/dmasound_paula.c
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ static MACHINE machAmiga = {
/*** Config & Setup **********************************************************/


int __init dmasound_paula_init(void)
static int __init dmasound_paula_init(void)
{
int err;

Expand Down
2 changes: 1 addition & 1 deletion sound/oss/dmasound/dmasound_q40.c
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ static MACHINE machQ40 = {
/*** Config & Setup **********************************************************/


int __init dmasound_q40_init(void)
static int __init dmasound_q40_init(void)
{
if (MACH_IS_Q40) {
dmasound.mach = machQ40;
Expand Down

0 comments on commit 0a1b42d

Please sign in to comment.