Automatic merge with /usr/src/ntfs-2.6.git.

21 files changed, 70 insertions, 92 deletions

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index e537bd66a707..3b1fafc8f4f5 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -6,7 +6,7 @@
 # Prompt user for primary drivers.
 config SOUND_BT878
         tristate "BT878 audio dma"
-        depends on SOUND_PRIME!=n && SOUND
+        depends on SOUND_PRIME
         ---help---
           Audio DMA support for bt878 based grabber boards.  As you might have
           already noticed, bt878 is listed with two functions in /proc/pci.
@@ -22,7 +22,7 @@ config SOUND_BT878
 
 config SOUND_CMPCI
         tristate "C-Media PCI (CMI8338/8738)"
-        depends on SOUND_PRIME!=n && SOUND && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y or M if you have a PCI sound card using the CMI8338
           or the CMI8738 chipset.  Data on these chips are available at
@@ -61,7 +61,7 @@ config SOUND_CMPCI_JOYSTICK
 
 config SOUND_EMU10K1
         tristate "Creative SBLive! (EMU10K1)"
-        depends on SOUND_PRIME!=n && SOUND && PCI
+        depends on SOUND_PRIME && PCI
         ---help---
           Say Y or M if you have a PCI sound card using the EMU10K1 chipset,
           such as the Creative SBLive!, SB PCI512 or Emu-APS.
@@ -87,7 +87,7 @@ config MIDI_EMU10K1
 
 config SOUND_FUSION
         tristate "Crystal SoundFusion (CS4280/461x)"
-        depends on SOUND_PRIME!=n && SOUND
+        depends on SOUND_PRIME
         help
           This module drives the Crystal SoundFusion devices (CS4280/46xx
           series) when wired as native sound drivers with AC97 codecs.  If
@@ -95,14 +95,14 @@ config SOUND_FUSION
 
 config SOUND_CS4281
         tristate "Crystal Sound CS4281"
-        depends on SOUND_PRIME!=n && SOUND
+        depends on SOUND_PRIME
         help
           Picture and feature list at
           <http://www.pcbroker.com/crystal4281.html>.
 
 config SOUND_BCM_CS4297A
         tristate "Crystal Sound CS4297a (for Swarm)"
-        depends on SOUND_PRIME!=n && SIBYTE_SWARM && SOUND
+        depends on SOUND_PRIME && SIBYTE_SWARM
         help
           The BCM91250A has a Crystal CS4297a on synchronous serial
           port B (in addition to the DB-9 serial port).  Say Y or M
@@ -112,7 +112,7 @@ config SOUND_BCM_CS4297A
 
 config SOUND_ES1370
         tristate "Ensoniq AudioPCI (ES1370)"
-        depends on SOUND_PRIME!=n && SOUND && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +125,7 @@ config SOUND_ES1370
 
 config SOUND_ES1371
         tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
-        depends on SOUND_PRIME!=n && SOUND && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +138,7 @@ config SOUND_ES1371
 
 config SOUND_ESSSOLO1
         tristate "ESS Technology Solo1" 
-        depends on SOUND_PRIME!=n && SOUND && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the ESS Technology
           Solo1 chip. To find out if your sound card uses a
@@ -149,7 +149,7 @@ config SOUND_ESSSOLO1
 
 config SOUND_MAESTRO
         tristate "ESS Maestro, Maestro2, Maestro2E driver"
-        depends on SOUND_PRIME!=n && SOUND && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y or M if you have a sound system driven by ESS's Maestro line
           of PCI sound chips.  These include the Maestro 1, Maestro 2, and
@@ -158,28 +158,28 @@ config SOUND_MAESTRO
 
 config SOUND_MAESTRO3
         tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)"
-        depends on SOUND_PRIME!=n && SOUND && PCI && EXPERIMENTAL
+        depends on SOUND_PRIME && PCI && EXPERIMENTAL
         help
           Say Y or M if you have a sound system driven by ESS's Maestro 3
           PCI sound chip.
 
 config SOUND_ICH
         tristate "Intel ICH (i8xx) audio support"
-        depends on SOUND_PRIME!=n && PCI
+        depends on SOUND_PRIME && PCI
         help
           Support for integral audio in Intel's I/O Controller Hub (ICH)
           chipset, as used on the 810/820/840 motherboards.
 
 config SOUND_HARMONY
         tristate "PA Harmony audio driver"
-        depends on GSC_LASI && SOUND_PRIME!=n
+        depends on GSC_LASI && SOUND_PRIME
         help
           Say 'Y' or 'M' to include support for Harmony soundchip
           on HP 712, 715/new and many other GSC based machines.
 
 config SOUND_SONICVIBES
         tristate "S3 SonicVibes"
-        depends on SOUND_PRIME!=n && SOUND
+        depends on SOUND_PRIME
         help
           Say Y or M if you have a PCI sound card utilizing the S3
           SonicVibes chipset. To find out if your sound card uses a
@@ -190,7 +190,7 @@ config SOUND_SONICVIBES
 
 config SOUND_VWSND
         tristate "SGI Visual Workstation Sound"
-        depends on SOUND_PRIME!=n && X86_VISWS && SOUND
+        depends on SOUND_PRIME && X86_VISWS
         help
           Say Y or M if you have an SGI Visual Workstation and you want to be
           able to use its on-board audio.  Read
@@ -199,18 +199,18 @@ config SOUND_VWSND
 
 config SOUND_HAL2
         tristate "SGI HAL2 sound (EXPERIMENTAL)"
-        depends on SOUND_PRIME!=n && SOUND && SGI_IP22 && EXPERIMENTAL
+        depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL
         help
           Say Y or M if you have an SGI Indy system and want to be able to
           use it's on-board A2 audio system.
 
 config SOUND_IT8172
         tristate "IT8172G Sound"
-        depends on SOUND_PRIME!=n && (MIPS_ITE8172 || MIPS_IVR) && SOUND
+        depends on SOUND_PRIME && (MIPS_ITE8172 || MIPS_IVR)
 
 config SOUND_VRC5477
         tristate "NEC Vrc5477 AC97 sound"
-        depends on SOUND_PRIME!=n && DDB5477 && SOUND
+        depends on SOUND_PRIME && DDB5477
         help
           Say Y here to enable sound support for the NEC Vrc5477 chip, an
           integrated, multi-function controller chip for MIPS CPUs.  Works
@@ -218,15 +218,15 @@ config SOUND_VRC5477
 
 config SOUND_AU1000
         tristate "Au1000 Sound"
-        depends on SOUND_PRIME!=n && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SOUND
+        depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500)
 
 config SOUND_AU1550_AC97
         tristate "Au1550 AC97 Sound"
-        depends on SOUND_PRIME!=n && SOC_AU1550 && SOUND
+        depends on SOUND_PRIME && SOC_AU1550
 
 config SOUND_TRIDENT
         tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
-        depends on SOUND_PRIME!=n && SOUND
+        depends on SOUND_PRIME
         ---help---
           Say Y or M if you have a PCI sound card utilizing the Trident
           4DWave-DX/NX chipset or your mother board chipset has SiS 7018
@@ -267,7 +267,7 @@ config SOUND_TRIDENT
 
 config SOUND_MSNDCLAS
         tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
-        depends on SOUND_PRIME!=n && SOUND && (m || !STANDALONE)
+        depends on SOUND_PRIME && (m || !STANDALONE)
         help
           Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
           Monterey (not for the Pinnacle or Fiji).
@@ -331,7 +331,7 @@ config MSNDCLAS_IO
 
 config SOUND_MSNDPIN
         tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji"
-        depends on SOUND_PRIME!=n && SOUND && (m || !STANDALONE)
+        depends on SOUND_PRIME && (m || !STANDALONE)
         help
           Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji.
           See <file:Documentation/sound/oss/MultiSound> for important information
@@ -492,7 +492,7 @@ config MSND_FIFOSIZE
 
 config SOUND_VIA82CXXX
         tristate "VIA 82C686 Audio Codec"
-        depends on SOUND_PRIME!=n && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y here to include support for the audio codec found on VIA
           82Cxxx-based chips. Typically these are built into a motherboard.
@@ -512,7 +512,7 @@ config MIDI_VIA82CXXX
 
 config SOUND_OSS
         tristate "OSS sound modules"
-        depends on SOUND_PRIME!=n && SOUND
+        depends on SOUND_PRIME
         help
           OSS is the Open Sound System suite of sound card drivers.  They make
           sound programming easier since they provide a common API.  Say Y or
@@ -1077,7 +1077,7 @@ config SOUND_WAVEARTIST
 
 config SOUND_TVMIXER
         tristate "TV card (bt848) mixer support"
-        depends on SOUND_PRIME!=n && SOUND && I2C
+        depends on SOUND_PRIME && I2C
         help
           Support for audio mixer facilities on the BT848 TV frame-grabber
           card.
@@ -1088,11 +1088,11 @@ config SOUND_KAHLUA
 
 config SOUND_ALI5455
         tristate "ALi5455 audio support"
-        depends on SOUND_PRIME!=n && PCI
+        depends on SOUND_PRIME && PCI
 
 config SOUND_FORTE
         tristate "ForteMedia FM801 driver"
-        depends on SOUND_PRIME!=n && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y or M if you want driver support for the ForteMedia FM801 PCI
           audio controller (Abit AU10, Genius Sound Maker, HP Workstation
@@ -1100,7 +1100,7 @@ config SOUND_FORTE
 
 config SOUND_RME96XX
         tristate "RME Hammerfall (RME96XX) support"
-        depends on SOUND_PRIME!=n && PCI
+        depends on SOUND_PRIME && PCI
         help
           Say Y or M if you have a Hammerfall or Hammerfall light
           multichannel card from RME. If you want to access advanced
@@ -1108,11 +1108,11 @@ config SOUND_RME96XX
 
 config SOUND_AD1980
         tristate "AD1980 front/back switch plugin"
-        depends on SOUND_PRIME!=n
+        depends on SOUND_PRIME
 
 config SOUND_SH_DAC_AUDIO
         tristate "SuperH DAC audio support"
-        depends on SOUND_PRIME!=n && SOUND && CPU_SH3
+        depends on SOUND_PRIME && CPU_SH3
 
 config SOUND_SH_DAC_AUDIO_CHANNEL
         int "    DAC channel"
diff --git a/sound/oss/ad1816.c b/sound/oss/ad1816.c
index 22dae5d0fda3..95586de02028 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/ad1848.c b/sound/oss/ad1848.c
index 4384dac3f794..7c835abd99bc 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -2178,8 +2178,7 @@ void ad1848_unload(int io_base, int irq, int dma_playback, int dma_capture, int
                 
         if (devc != NULL)
         {
-                if(audio_devs[dev]->portc!=NULL)
-                        kfree(audio_devs[dev]->portc);
+                kfree(audio_devs[dev]->portc);
                 release_region(devc->base, 4);
 
                 if (!share_dma)
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index b767c621fd09..2cfd214e4c2a 100644
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -277,8 +277,7 @@ static void ad1889_free_dev(ad1889_dev_t *dev)
 
         for (j = 0; j < AD_MAX_STATES; j++) {
                 dmabuf = &dev->state[j].dmabuf;
-                if (dmabuf->rawbuf != NULL) 
-                        kfree(dmabuf->rawbuf);
+                kfree(dmabuf->rawbuf);
         }
 
         kfree(dev);
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 34720e66dae1..74dcca78c6c0 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -123,6 +123,7 @@
 #include <linux/smp_lock.h>
 #include <linux/bitops.h>
 #include <linux/wait.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -3058,7 +3059,7 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id
                 return -ENODEV;
         if (pcidev->irq == 0)
                 return -ENODEV;
-        i = pci_set_dma_mask(pcidev, 0xffffffff);
+        i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
         if (i) {
                 printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n");
                 return i;
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 5281b88987f3..33108661e671 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -671,14 +671,10 @@ static void PMacIrqCleanup(void)
         release_OF_resource(awacs_node, 1);
         release_OF_resource(awacs_node, 2);
 
-        if (awacs_tx_cmd_space)
-                kfree(awacs_tx_cmd_space);
-        if (awacs_rx_cmd_space)
-                kfree(awacs_rx_cmd_space);
-        if (beep_dbdma_cmd_space)
-                kfree(beep_dbdma_cmd_space);
-        if (beep_buf)
-                kfree(beep_buf);
+        kfree(awacs_tx_cmd_space);
+        kfree(awacs_rx_cmd_space);
+        kfree(beep_dbdma_cmd_space);
+        kfree(beep_buf);
 #ifdef CONFIG_PMAC_PBOOK
         pmu_unregister_sleep_notifier(&awacs_sleep_notifier);
 #endif
@@ -2301,8 +2297,7 @@ if (count <= 0)
 #endif
 
         if ((write_sq.max_count + 1) > number_of_tx_cmd_buffers) {
-                if (awacs_tx_cmd_space)
-                        kfree(awacs_tx_cmd_space);
+                kfree(awacs_tx_cmd_space);
                 number_of_tx_cmd_buffers = 0;
 
                 /* we need nbufs + 1 (for the loop) and we should request + 1
@@ -2360,8 +2355,7 @@ if (count <= 0)
 #endif
 
         if ((read_sq.max_count+1) > number_of_rx_cmd_buffers ) {
-                if (awacs_rx_cmd_space)
-                        kfree(awacs_rx_cmd_space);
+                kfree(awacs_rx_cmd_space);
                 number_of_rx_cmd_buffers = 0;
 
                 /* we need nbufs + 1 (for the loop) and we should request + 1 again
@@ -2805,7 +2799,7 @@ __init setup_beep(void)
         beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
         if (beep_buf == NULL) {
                 printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n");
-                if( beep_dbdma_cmd_space ) kfree(beep_dbdma_cmd_space) ;
+                kfree(beep_dbdma_cmd_space) ;
                 return -ENOMEM ;
         }
         return 0 ;
diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c
index 33dea3d56c1e..b40b5f97aace 100644
--- a/sound/oss/emu10k1/midi.c
+++ b/sound/oss/emu10k1/midi.c
@@ -523,10 +523,8 @@ void emu10k1_seq_midi_close(int dev)
         card = midi_devs[dev]->devc;
         emu10k1_mpuout_close(card);
 
-        if (card->seq_mididev) {
-                kfree(card->seq_mididev);
-                card->seq_mididev = NULL;
-        }
+        kfree(card->seq_mididev);
+        card->seq_mididev = NULL;
 }
 
 int emu10k1_seq_midi_out(int dev, unsigned char midi_byte)
diff --git a/sound/oss/emu10k1/passthrough.c b/sound/oss/emu10k1/passthrough.c
index 4094be55f3be..4e3baca7d41f 100644
--- a/sound/oss/emu10k1/passthrough.c
+++ b/sound/oss/emu10k1/passthrough.c
@@ -213,8 +213,7 @@ void emu10k1_pt_stop(struct emu10k1_card *card)
                                 sblive_writeptr(card, SPCS0 + i, 0, pt->old_spcs[i]);
                 }
                 pt->state = PT_STATE_INACTIVE;
-                if(pt->buf)
-                        kfree(pt->buf);
+                kfree(pt->buf);
         }
 }
 
diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c
index 056091cff266..886f61c1c34a 100644
--- a/sound/oss/es1370.c
+++ b/sound/oss/es1370.c
@@ -156,6 +156,7 @@
 #include <linux/spinlock.h>
 #include <linux/gameport.h>
 #include <linux/wait.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -2569,7 +2570,7 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic
                 return -ENODEV;
         if (pcidev->irq == 0) 
                 return -ENODEV;
-        i = pci_set_dma_mask(pcidev, 0xffffffff);
+        i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
         if (i) {
                 printk(KERN_WARNING "es1370: architecture does not support 32bit PCI busmaster DMA\n");
                 return i;
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index a50fddaeea21..9266b777387b 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -128,6 +128,7 @@
 #include <linux/ac97_codec.h>
 #include <linux/gameport.h>
 #include <linux/wait.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -2804,7 +2805,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
                 return -ENODEV;
         if (pcidev->irq == 0) 
                 return -ENODEV;
-        i = pci_set_dma_mask(pcidev, 0xffffffff);
+        i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
         if (i) {
                 printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n");
                 return i;
diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
index 6b3b9a99579d..fb09065d07c8 100644
--- a/sound/oss/esssolo1.c
+++ b/sound/oss/esssolo1.c
@@ -104,6 +104,7 @@
 #include <linux/smp_lock.h>
 #include <linux/gameport.h>
 #include <linux/wait.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -2326,7 +2327,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
          * to 24 bits first, then 32 bits (playback only) if that fails.
          */
         if (pci_set_dma_mask(pcidev, 0x00ffffff) &&
-            pci_set_dma_mask(pcidev, 0xffffffff)) {
+            pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {
                 printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n");
                 return -ENODEV;
         }
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index 52d2db4bc312..3dce504e6d6d 100644
--- a/sound/oss/maestro.c
+++ b/sound/oss/maestro.c
@@ -2356,7 +2356,7 @@ ess_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
         }
 
 rec_return_free:
-        if(combbuf) kfree(combbuf);
+        kfree(combbuf);
         return ret;
 }
 
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index b66f53fa8db0..0aac54c68f01 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -1240,8 +1240,7 @@ void unload_mpu401(struct address_info *hw_config)
                 p=mpu401_synth_operations[n];
                 sound_unload_mididev(n);
                 sound_unload_timerdev(hw_config->slots[2]);
-                if(p)
-                        kfree(p);
+                kfree(p);
         }
 }
 
diff --git a/sound/oss/nm256.h b/sound/oss/nm256.h
index eae7d99d6826..21e07b5081f2 100644
--- a/sound/oss/nm256.h
+++ b/sound/oss/nm256.h
@@ -128,9 +128,6 @@ struct nm256_info
     struct nm256_info *next_card;
 };
 
-/* Debug flag--bigger numbers mean more output. */
-extern int nm256_debug;
-
 /* The BIOS signature. */
 #define NM_SIGNATURE 0x4e4d0000
 /* Signature mask. */
@@ -284,7 +281,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 f9166e135192..66970062eb36 100644
--- a/sound/oss/nm256_audio.c
+++ b/sound/oss/nm256_audio.c
@@ -28,12 +28,13 @@
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include "sound_config.h"
-#include "nm256.h"
-#include "nm256_coeff.h"
 
-int nm256_debug;
+static int nm256_debug;
 static int force_load;
 
+#include "nm256.h"
+#include "nm256_coeff.h"
+
 /* 
  * The size of the playback reserve.  When the playback buffer has less
  * than NM256_PLAY_WMARK_SIZE bytes to output, we request a new
@@ -138,7 +139,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 0ceecc20077b..6fc07f3cb33b 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/rme96xx.c b/sound/oss/rme96xx.c
index b4278eecc917..7609c68a89f4 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -1750,9 +1750,7 @@ static unsigned int rme96xx_poll(struct file *file, struct poll_table_struct *wa
 
 
 static struct file_operations rme96xx_audio_fops = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
         .owner   = THIS_MODULE,
-#endif
         .read    = rme96xx_read,
         .write   = rme96xx_write,
         .poll    = rme96xx_poll,
@@ -1852,9 +1850,7 @@ static int rme96xx_mixer_release(struct inode *inode, struct file *file)
 }
 
 static /*const*/ struct file_operations rme96xx_mixer_fops = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
         .owner   = THIS_MODULE,
-#endif
         .ioctl   = rme96xx_mixer_ioctl,
         .open    = rme96xx_mixer_open,
         .release = rme96xx_mixer_release,
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index ce359e6c933a..5f955e3d2e26 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -915,8 +915,8 @@ void sb_dsp_unload(struct address_info *hw_config, int sbmpu)
         }
         else
                 release_region(hw_config->io_base, 16);
-        if(detected_devc)
-                kfree(detected_devc);
+
+        kfree(detected_devc);
 }
 
 /*
diff --git a/sound/oss/sscape.c b/sound/oss/sscape.c
index 50ca64629450..9ed5211c3168 100644
--- a/sound/oss/sscape.c
+++ b/sound/oss/sscape.c
@@ -991,7 +991,6 @@ static void __init sscape_pnp_init_hw(sscape_info* devc)
         unsigned i;
         static  char code_file_name[23] = "/sndscape/sndscape.cox";
         
-        int sscape_sb_enable            = 0;
         int sscape_joystic_enable       = 0x7f;
         int sscape_mic_enable           = 0;
         int sscape_ext_midi             = 0;            
@@ -1015,14 +1014,9 @@ static void __init sscape_pnp_init_hw(sscape_info* devc)
         sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40);
         sscape_write( devc, 3, ( devc -> dma << 4) | 0x80);
 
-        if ( sscape_sb_enable )
-                sscape_write (devc, 4, 0xF0 | (sb_irq << 2) | midi_irq);
-        else    
-                sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq);
+        sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq);
 
         i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0);
-        if ( sscape_sb_enable )
-                i |= devc->ic_type == IC_ODIE ? 0x05 : 0x07;        
         if (sscape_joystic_enable) i |= 8;
         
         sscape_write (devc, 9, i);
diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index 077b76797665..a7ef04fab075 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 cce1278dc487..b92ba8921638 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)
     
 {