diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-10-04 05:17:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:32 -0400 |
commit | d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6 (patch) | |
tree | a48388734053900a8379042757ee241d1e9dfc7b /sound/oss/dmabuf.c | |
parent | 595182bcdf64fbfd7ae22c67ea6081b7d387d246 (diff) |
[PATCH] The scheduled removal of some OSS drivers
This patch contains the scheduled removal of OSS drivers that:
- have ALSA drivers for the same hardware without known regressions and
- whose Kconfig options have been removed in 2.6.17.
[michal.k.k.piotrowski@gmail.com: build fix]
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/dmabuf.c')
-rw-r--r-- | sound/oss/dmabuf.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index 6c1cf74b78c5..6ff67f73cbb9 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c | |||
@@ -1155,36 +1155,6 @@ void DMAbuf_inputintr(int dev) | |||
1155 | spin_unlock_irqrestore(&dmap->lock,flags); | 1155 | spin_unlock_irqrestore(&dmap->lock,flags); |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | int DMAbuf_open_dma(int dev) | ||
1159 | { | ||
1160 | /* | ||
1161 | * NOTE! This routine opens only the primary DMA channel (output). | ||
1162 | */ | ||
1163 | struct audio_operations *adev = audio_devs[dev]; | ||
1164 | int err; | ||
1165 | |||
1166 | if ((err = open_dmap(adev, OPEN_READWRITE, adev->dmap_out)) < 0) | ||
1167 | return -EBUSY; | ||
1168 | dma_init_buffers(adev->dmap_out); | ||
1169 | adev->dmap_out->flags |= DMA_ALLOC_DONE; | ||
1170 | adev->dmap_out->fragment_size = adev->dmap_out->buffsize; | ||
1171 | |||
1172 | if (adev->dmap_out->dma >= 0) { | ||
1173 | unsigned long flags; | ||
1174 | |||
1175 | flags=claim_dma_lock(); | ||
1176 | clear_dma_ff(adev->dmap_out->dma); | ||
1177 | disable_dma(adev->dmap_out->dma); | ||
1178 | release_dma_lock(flags); | ||
1179 | } | ||
1180 | return 0; | ||
1181 | } | ||
1182 | |||
1183 | void DMAbuf_close_dma(int dev) | ||
1184 | { | ||
1185 | close_dmap(audio_devs[dev], audio_devs[dev]->dmap_out); | ||
1186 | } | ||
1187 | |||
1188 | void DMAbuf_init(int dev, int dma1, int dma2) | 1158 | void DMAbuf_init(int dev, int dma1, int dma2) |
1189 | { | 1159 | { |
1190 | struct audio_operations *adev = audio_devs[dev]; | 1160 | struct audio_operations *adev = audio_devs[dev]; |