scheduled OSS driver removal

This patch contains the scheduled removal of OSS drivers whose config
options have been removed in 2.6.23.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 4 insertions, 42 deletions

diff --git a/include/asm-powerpc/dma.h b/include/asm-powerpc/dma.h
index 7a4374bdbef4..a7e06e25c708 100644
--- a/include/asm-powerpc/dma.h
+++ b/include/asm-powerpc/dma.h
@@ -93,16 +93,6 @@
  *
  */
 
-/* see prep_setup_arch() for detailed informations */
-#if defined(CONFIG_SOUND_CS4232) && defined(CONFIG_PPC_PREP)
-extern long ppc_cs4232_dma, ppc_cs4232_dma2;
-#define SND_DMA1 ppc_cs4232_dma
-#define SND_DMA2 ppc_cs4232_dma2
-#else
-#define SND_DMA1 -1
-#define SND_DMA2 -1
-#endif
-
 /* 8237 DMA controllers */
 #define IO_DMA1_BASE    0x00    /* 8 bit slave DMA, channels 0..3 */
 #define IO_DMA2_BASE    0xC0    /* 16 bit master DMA, ch 4(=slave input)..7 */
@@ -269,24 +259,15 @@ static __inline__ void set_dma_page(unsigned int dmanr, int pagenr)
                 dma_outb(pagenr >> 8, DMA_HI_PAGE_3);
                 break;
         case 5:
-                if (SND_DMA1 == 5 || SND_DMA2 == 5)
-                        dma_outb(pagenr, DMA_LO_PAGE_5);
-                else
-                        dma_outb(pagenr & 0xfe, DMA_LO_PAGE_5);
+                dma_outb(pagenr & 0xfe, DMA_LO_PAGE_5);
                 dma_outb(pagenr >> 8, DMA_HI_PAGE_5);
                 break;
         case 6:
-                if (SND_DMA1 == 6 || SND_DMA2 == 6)
-                        dma_outb(pagenr, DMA_LO_PAGE_6);
-                else
-                        dma_outb(pagenr & 0xfe, DMA_LO_PAGE_6);
+                dma_outb(pagenr & 0xfe, DMA_LO_PAGE_6);
                 dma_outb(pagenr >> 8, DMA_HI_PAGE_6);
                 break;
         case 7:
-                if (SND_DMA1 == 7 || SND_DMA2 == 7)
-                        dma_outb(pagenr, DMA_LO_PAGE_7);
-                else
-                        dma_outb(pagenr & 0xfe, DMA_LO_PAGE_7);
+                dma_outb(pagenr & 0xfe, DMA_LO_PAGE_7);
                 dma_outb(pagenr >> 8, DMA_HI_PAGE_7);
                 break;
         }
@@ -302,12 +283,6 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int phys)
                          ((dmanr & 3) << 1) + IO_DMA1_BASE);
                 dma_outb((phys >> 8) & 0xff,
                          ((dmanr & 3) << 1) + IO_DMA1_BASE);
-        } else if (dmanr == SND_DMA1 || dmanr == SND_DMA2) {
-                dma_outb(phys & 0xff,
-                         ((dmanr & 3) << 2) + IO_DMA2_BASE);
-                dma_outb((phys >> 8) & 0xff,
-                         ((dmanr & 3) << 2) + IO_DMA2_BASE);
-                dma_outb((dmanr & 3), DMA2_EXT_REG);
         } else {
                 dma_outb((phys >> 1) & 0xff,
                          ((dmanr & 3) << 2) + IO_DMA2_BASE);
@@ -334,11 +309,6 @@ static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count)
                          ((dmanr & 3) << 1) + 1 + IO_DMA1_BASE);
                 dma_outb((count >> 8) & 0xff,
                          ((dmanr & 3) << 1) + 1 + IO_DMA1_BASE);
-        } else if (dmanr == SND_DMA1 || dmanr == SND_DMA2) {
-                dma_outb(count & 0xff,
-                         ((dmanr & 3) << 2) + 2 + IO_DMA2_BASE);
-                dma_outb((count >> 8) & 0xff,
-                         ((dmanr & 3) << 2) + 2 + IO_DMA2_BASE);
         } else {
                 dma_outb((count >> 1) & 0xff,
                          ((dmanr & 3) << 2) + 2 + IO_DMA2_BASE);
@@ -368,8 +338,7 @@ static __inline__ int get_dma_residue(unsigned int dmanr)
         count = 1 + dma_inb(io_port);
         count += dma_inb(io_port) << 8;
 
-        return (dmanr <= 3 || dmanr == SND_DMA1 || dmanr == SND_DMA2)
-            ? count : (count << 1);
+        return (dmanr <= 3) ? count : (count << 1);
 }
 
 /* These are in kernel/dma.c: */
diff --git a/include/linux/ac97_codec.h b/include/linux/ac97_codec.h
index 22eb9367235a..0260c3e79fdd 100644
--- a/include/linux/ac97_codec.h
+++ b/include/linux/ac97_codec.h
@@ -326,11 +326,7 @@ struct ac97_ops
 #define AC97_DEFAULT_POWER_OFF 4 /* Needs warm reset to power up */
 };
 
-extern int ac97_read_proc (char *page_out, char **start, off_t off,
-                           int count, int *eof, void *data);
 extern int ac97_probe_codec(struct ac97_codec *);
-extern unsigned int ac97_set_adc_rate(struct ac97_codec *codec, unsigned int rate);
-extern unsigned int ac97_set_dac_rate(struct ac97_codec *codec, unsigned int rate);
 
 extern struct ac97_codec *ac97_alloc_codec(void);
 extern void ac97_release_codec(struct ac97_codec *codec);
@@ -363,7 +359,4 @@ struct ac97_quirk {
         int type;               /* quirk type above */
 };
 
-struct pci_dev;
-extern int ac97_tune_hardware(struct pci_dev *pdev, struct ac97_quirk *quirk, int override);
-
 #endif /* _AC97_CODEC_H_ */