From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] sound/oss/: cleanups
Date: Thu, 24 Mar 2005 04:09:06 +0100 [thread overview]
Message-ID: <20050324030906.GO1948@stusta.de> (raw)
This patch contains cleanups including the following:
- make needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 6 Mar 2005
sound/oss/ad1816.c | 2 +-
sound/oss/nm256.h | 2 +-
sound/oss/nm256_audio.c | 4 ++--
sound/oss/nm256_coeff.h | 2 +-
sound/oss/v_midi.c | 2 --
sound/oss/wavfront.c | 12 ++++++------
6 files changed, 11 insertions(+), 13 deletions(-)
--- linux-2.6.11-mm1-full/sound/oss/ad1816.c.old 2005-03-06 22:13:46.000000000 +0100
+++ linux-2.6.11-mm1-full/sound/oss/ad1816.c 2005-03-06 22:22:52.000000000 +0100
@@ -592,7 +592,7 @@
{{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),
--- linux-2.6.11-mm1-full/sound/oss/nm256.h.old 2005-03-06 22:14:23.000000000 +0100
+++ linux-2.6.11-mm1-full/sound/oss/nm256.h 2005-03-06 22:24:47.000000000 +0100
@@ -284,7 +284,7 @@
}
/* 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
\f
--- linux-2.6.11-mm1-full/sound/oss/nm256_coeff.h.old 2005-03-06 22:16:18.000000000 +0100
+++ linux-2.6.11-mm1-full/sound/oss/nm256_coeff.h 2005-03-06 22:22:52.000000000 +0100
@@ -4650,7 +4650,7 @@
card->coeffsCurrent = 1;
}
-void
+static void
nm256_loadCoefficient (struct nm256_info *card, int which, int number)
{
static u16 addrs[3] = { 0x1c, 0x21c, 0x408 };
--- linux-2.6.11-mm1-full/sound/oss/nm256_audio.c.old 2005-03-06 22:14:42.000000000 +0100
+++ linux-2.6.11-mm1-full/sound/oss/nm256_audio.c 2005-03-06 22:22:52.000000000 +0100
@@ -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 buffertop;
/* Check to see if we're using the bank of cached coefficients. */
-int
+static int
nm256_cachedCoefficients (struct nm256_info *card)
{
return usecache;
--- linux-2.6.11-mm1-full/sound/oss/v_midi.c.old 2005-03-06 22:17:55.000000000 +0100
+++ linux-2.6.11-mm1-full/sound/oss/v_midi.c 2005-03-06 22:22:52.000000000 +0100
@@ -39,8 +39,6 @@
*/
-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)
--- linux-2.6.11-mm1-full/sound/oss/wavfront.c.old 2005-03-06 22:18:52.000000000 +0100
+++ linux-2.6.11-mm1-full/sound/oss/wavfront.c 2005-03-06 22:22:52.000000000 +0100
@@ -151,11 +151,11 @@
/*** 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 @@
return 0;
}
-void
+static void
wffx_mute (int onoff)
{
next reply other threads:[~2005-03-24 3:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-24 3:09 Adrian Bunk [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-03-06 22:07 [2.6 patch] sound/oss/: cleanups Adrian Bunk
2005-03-28 20:55 ` Benoit Boissinot
2005-03-28 22:03 ` Adrian Bunk
2005-03-31 21:34 ` Benoit Boissinot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050324030906.GO1948@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox