diff options
Diffstat (limited to 'sound/pci/au88x0/au88x0_pcm.c')
-rw-r--r-- | sound/pci/au88x0/au88x0_pcm.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c index f9a58b4a30e..b9d2f202cf9 100644 --- a/sound/pci/au88x0/au88x0_pcm.c +++ b/sound/pci/au88x0/au88x0_pcm.c | |||
@@ -189,7 +189,6 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream, | |||
189 | { | 189 | { |
190 | vortex_t *chip = snd_pcm_substream_chip(substream); | 190 | vortex_t *chip = snd_pcm_substream_chip(substream); |
191 | stream_t *stream = (stream_t *) (substream->runtime->private_data); | 191 | stream_t *stream = (stream_t *) (substream->runtime->private_data); |
192 | struct snd_sg_buf *sgbuf; | ||
193 | int err; | 192 | int err; |
194 | 193 | ||
195 | // Alloc buffer memory. | 194 | // Alloc buffer memory. |
@@ -199,8 +198,6 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream, | |||
199 | printk(KERN_ERR "Vortex: pcm page alloc failed!\n"); | 198 | printk(KERN_ERR "Vortex: pcm page alloc failed!\n"); |
200 | return err; | 199 | return err; |
201 | } | 200 | } |
202 | //sgbuf = (struct snd_sg_buf *) substream->runtime->dma_private; | ||
203 | sgbuf = snd_pcm_substream_sgbuf(substream); | ||
204 | /* | 201 | /* |
205 | printk(KERN_INFO "Vortex: periods %d, period_bytes %d, channels = %d\n", params_periods(hw_params), | 202 | printk(KERN_INFO "Vortex: periods %d, period_bytes %d, channels = %d\n", params_periods(hw_params), |
206 | params_period_bytes(hw_params), params_channels(hw_params)); | 203 | params_period_bytes(hw_params), params_channels(hw_params)); |
@@ -226,7 +223,7 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream, | |||
226 | stream = substream->runtime->private_data = &chip->dma_adb[dma]; | 223 | stream = substream->runtime->private_data = &chip->dma_adb[dma]; |
227 | stream->substream = substream; | 224 | stream->substream = substream; |
228 | /* Setup Buffers. */ | 225 | /* Setup Buffers. */ |
229 | vortex_adbdma_setbuffers(chip, dma, sgbuf, | 226 | vortex_adbdma_setbuffers(chip, dma, |
230 | params_period_bytes(hw_params), | 227 | params_period_bytes(hw_params), |
231 | params_periods(hw_params)); | 228 | params_periods(hw_params)); |
232 | } | 229 | } |
@@ -240,7 +237,7 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream, | |||
240 | &chip->dma_wt[substream->number]; | 237 | &chip->dma_wt[substream->number]; |
241 | stream->dma = substream->number; | 238 | stream->dma = substream->number; |
242 | stream->substream = substream; | 239 | stream->substream = substream; |
243 | vortex_wtdma_setbuffers(chip, substream->number, sgbuf, | 240 | vortex_wtdma_setbuffers(chip, substream->number, |
244 | params_period_bytes(hw_params), | 241 | params_period_bytes(hw_params), |
245 | params_periods(hw_params)); | 242 | params_periods(hw_params)); |
246 | } | 243 | } |
@@ -392,13 +389,6 @@ static snd_pcm_uframes_t snd_vortex_pcm_pointer(struct snd_pcm_substream *substr | |||
392 | return (bytes_to_frames(substream->runtime, current_ptr)); | 389 | return (bytes_to_frames(substream->runtime, current_ptr)); |
393 | } | 390 | } |
394 | 391 | ||
395 | /* Page callback. */ | ||
396 | /* | ||
397 | static struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigned long offset) { | ||
398 | |||
399 | |||
400 | } | ||
401 | */ | ||
402 | /* operators */ | 392 | /* operators */ |
403 | static struct snd_pcm_ops snd_vortex_playback_ops = { | 393 | static struct snd_pcm_ops snd_vortex_playback_ops = { |
404 | .open = snd_vortex_pcm_open, | 394 | .open = snd_vortex_pcm_open, |