git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
sound
/
pci
/
au88x0
/
au88x0_pcm.c
diff --git
a/sound/pci/au88x0/au88x0_pcm.c
b/sound/pci/au88x0/au88x0_pcm.c
index
6df634e
..
8e63221
100644
(file)
--- a/
sound/pci/au88x0/au88x0_pcm.c
+++ b/
sound/pci/au88x0/au88x0_pcm.c
@@
-28,7
+28,6
@@
#include <sound/pcm_params.h>
#include "au88x0.h"
#include <sound/pcm_params.h>
#include "au88x0.h"
-#define chip_t vortex_t
#define VORTEX_PCM_TYPE(x) (x->name[40])
/* hardware definition */
#define VORTEX_PCM_TYPE(x) (x->name[40])
/* hardware definition */
@@
-189,7
+188,7
@@
static int
snd_vortex_pcm_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params)
{
snd_vortex_pcm_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params)
{
-
chip
_t *chip = snd_pcm_substream_chip(substream);
+
vortex
_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) (substream->runtime->private_data);
snd_pcm_sgbuf_t *sgbuf;
int err;
stream_t *stream = (stream_t *) (substream->runtime->private_data);
snd_pcm_sgbuf_t *sgbuf;
int err;
@@
-250,7
+249,7
@@
snd_vortex_pcm_hw_params(snd_pcm_substream_t * substream,
/* hw_free callback */
static int snd_vortex_pcm_hw_free(snd_pcm_substream_t * substream)
{
/* hw_free callback */
static int snd_vortex_pcm_hw_free(snd_pcm_substream_t * substream)
{
-
chip
_t *chip = snd_pcm_substream_chip(substream);
+
vortex
_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) (substream->runtime->private_data);
// Delete audio routes.
stream_t *stream = (stream_t *) (substream->runtime->private_data);
// Delete audio routes.
@@
-305,7
+304,7
@@
static int snd_vortex_pcm_prepare(snd_pcm_substream_t * substream)
/* trigger callback */
static int snd_vortex_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
{
/* trigger callback */
static int snd_vortex_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
{
-
chip
_t *chip = snd_pcm_substream_chip(substream);
+
vortex
_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) substream->runtime->private_data;
int dma = stream->dma;
stream_t *stream = (stream_t *) substream->runtime->private_data;
int dma = stream->dma;