vserver 1.9.5.x5

[linux-2.6.git] / sound / isa / sb / sb8_main.c

diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c
index 25cdd02..87c9b1b 100644 (file)
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
@@ -42,8 +42,6 @@ MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Uros Bizjak <uros@kss-loka.si>")
 MODULE_DESCRIPTION("Routines for control of 8-bit SoundBlaster cards and clones");
 MODULE_LICENSE("GPL");
 
-#define chip_t sb_t
-
 #define SB8_CLOCK      1000000
 #define SB8_DEN(v)     ((SB8_CLOCK + (v) / 2) / (v))
 #define SB8_RATE(v)    (SB8_CLOCK / SB8_DEN(v))
@@ -427,7 +425,7 @@ static snd_pcm_hardware_t snd_sb8_capture =
  *
  */
  
-int snd_sb8_open(snd_pcm_substream_t *substream)
+static int snd_sb8_open(snd_pcm_substream_t *substream)
 {
        sb_t *chip = snd_pcm_substream_chip(substream);
        snd_pcm_runtime_t *runtime = substream->runtime;
@@ -452,11 +450,11 @@ int snd_sb8_open(snd_pcm_substream_t *substream)
                runtime->hw.rate_max = 44100;
                runtime->hw.channels_max = 2;
                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                   snd_sb8_hw_constraint_rate_channels, 0,
+                                   snd_sb8_hw_constraint_rate_channels, NULL,
                                    SNDRV_PCM_HW_PARAM_CHANNELS,
                                    SNDRV_PCM_HW_PARAM_RATE, -1);
                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                    snd_sb8_hw_constraint_channels_rate, 0,
+                                    snd_sb8_hw_constraint_channels_rate, NULL,
                                     SNDRV_PCM_HW_PARAM_RATE, -1);
                break;
        case SB_HW_201:
@@ -473,7 +471,7 @@ int snd_sb8_open(snd_pcm_substream_t *substream)
        return 0;       
 }
 
-int snd_sb8_close(snd_pcm_substream_t *substream)
+static int snd_sb8_close(snd_pcm_substream_t *substream)
 {
        unsigned long flags;
        sb_t *chip = snd_pcm_substream_chip(substream);