projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] au88x0 - clean up __devinit/__devexit
[powerpc.git]
/
sound
/
pci
/
au88x0
/
au88x0_pcm.c
diff --git
a/sound/pci/au88x0/au88x0_pcm.c
b/sound/pci/au88x0/au88x0_pcm.c
index
38bd2b5
..
6a13ca1
100644
(file)
--- a/
sound/pci/au88x0/au88x0_pcm.c
+++ b/
sound/pci/au88x0/au88x0_pcm.c
@@
-31,7
+31,7
@@
#define VORTEX_PCM_TYPE(x) (x->name[40])
/* hardware definition */
#define VORTEX_PCM_TYPE(x) (x->name[40])
/* hardware definition */
-static s
nd_pcm_hardware_t
snd_vortex_playback_hw_adb = {
+static s
truct snd_pcm_hardware
snd_vortex_playback_hw_adb = {
.info =
(SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |
.info =
(SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |
@@
-56,7
+56,7
@@
static snd_pcm_hardware_t snd_vortex_playback_hw_adb = {
};
#ifndef CHIP_AU8820
};
#ifndef CHIP_AU8820
-static s
nd_pcm_hardware_t
snd_vortex_playback_hw_a3d = {
+static s
truct snd_pcm_hardware
snd_vortex_playback_hw_a3d = {
.info =
(SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |
.info =
(SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |
@@
-76,7
+76,7
@@
static snd_pcm_hardware_t snd_vortex_playback_hw_a3d = {
.periods_max = 64,
};
#endif
.periods_max = 64,
};
#endif
-static s
nd_pcm_hardware_t
snd_vortex_playback_hw_spdif = {
+static s
truct snd_pcm_hardware
snd_vortex_playback_hw_spdif = {
.info =
(SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |
.info =
(SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |
@@
-99,7
+99,7
@@
static snd_pcm_hardware_t snd_vortex_playback_hw_spdif = {
};
#ifndef CHIP_AU8810
};
#ifndef CHIP_AU8810
-static s
nd_pcm_hardware_t
snd_vortex_playback_hw_wt = {
+static s
truct snd_pcm_hardware
snd_vortex_playback_hw_wt = {
.info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID),
.info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID),
@@
-117,10
+117,10
@@
static snd_pcm_hardware_t snd_vortex_playback_hw_wt = {
};
#endif
/* open callback */
};
#endif
/* open callback */
-static int snd_vortex_pcm_open(s
nd_pcm_substream_t *
substream)
+static int snd_vortex_pcm_open(s
truct snd_pcm_substream *
substream)
{
vortex_t *vortex = snd_pcm_substream_chip(substream);
{
vortex_t *vortex = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+ s
truct snd_pcm_runtime
*runtime = substream->runtime;
int err;
/* Force equal size periods */
int err;
/* Force equal size periods */
@@
-169,7
+169,7
@@
static int snd_vortex_pcm_open(snd_pcm_substream_t * substream)
}
/* close callback */
}
/* close callback */
-static int snd_vortex_pcm_close(s
nd_pcm_substream_t *
substream)
+static int snd_vortex_pcm_close(s
truct snd_pcm_substream *
substream)
{
//vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) substream->runtime->private_data;
{
//vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) substream->runtime->private_data;
@@
-185,12
+185,12
@@
static int snd_vortex_pcm_close(snd_pcm_substream_t * substream)
/* hw_params callback */
static int
/* hw_params callback */
static int
-snd_vortex_pcm_hw_params(s
nd_pcm_substream_t *
substream,
- s
nd_pcm_hw_params_t *
hw_params)
+snd_vortex_pcm_hw_params(s
truct snd_pcm_substream *
substream,
+ s
truct snd_pcm_hw_params *
hw_params)
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) (substream->runtime->private_data);
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) (substream->runtime->private_data);
- s
nd_pcm_sgbuf_t
*sgbuf;
+ s
truct snd_sg_buf
*sgbuf;
int err;
// Alloc buffer memory.
int err;
// Alloc buffer memory.
@@
-200,7
+200,7
@@
snd_vortex_pcm_hw_params(snd_pcm_substream_t * substream,
printk(KERN_ERR "Vortex: pcm page alloc failed!\n");
return err;
}
printk(KERN_ERR "Vortex: pcm page alloc failed!\n");
return err;
}
- //sgbuf = (s
nd_pcm_sgbuf_t
*) substream->runtime->dma_private;
+ //sgbuf = (s
truct snd_sg_buf
*) substream->runtime->dma_private;
sgbuf = snd_pcm_substream_sgbuf(substream);
/*
printk(KERN_INFO "Vortex: periods %d, period_bytes %d, channels = %d\n", params_periods(hw_params),
sgbuf = snd_pcm_substream_sgbuf(substream);
/*
printk(KERN_INFO "Vortex: periods %d, period_bytes %d, channels = %d\n", params_periods(hw_params),
@@
-251,7
+251,7
@@
snd_vortex_pcm_hw_params(snd_pcm_substream_t * substream,
}
/* hw_free callback */
}
/* hw_free callback */
-static int snd_vortex_pcm_hw_free(s
nd_pcm_substream_t *
substream)
+static int snd_vortex_pcm_hw_free(s
truct snd_pcm_substream *
substream)
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) (substream->runtime->private_data);
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) (substream->runtime->private_data);
@@
-277,10
+277,10
@@
static int snd_vortex_pcm_hw_free(snd_pcm_substream_t * substream)
}
/* prepare callback */
}
/* prepare callback */
-static int snd_vortex_pcm_prepare(s
nd_pcm_substream_t *
substream)
+static int snd_vortex_pcm_prepare(s
truct snd_pcm_substream *
substream)
{
vortex_t *chip = snd_pcm_substream_chip(substream);
{
vortex_t *chip = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+ s
truct snd_pcm_runtime
*runtime = substream->runtime;
stream_t *stream = (stream_t *) substream->runtime->private_data;
int dma = stream->dma, fmt, dir;
stream_t *stream = (stream_t *) substream->runtime->private_data;
int dma = stream->dma, fmt, dir;
@@
-310,7
+310,7
@@
static int snd_vortex_pcm_prepare(snd_pcm_substream_t * substream)
}
/* trigger callback */
}
/* trigger callback */
-static int snd_vortex_pcm_trigger(s
nd_pcm_substream_t *
substream, int cmd)
+static int snd_vortex_pcm_trigger(s
truct snd_pcm_substream *
substream, int cmd)
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) substream->runtime->private_data;
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) substream->runtime->private_data;
@@
-374,7
+374,7
@@
static int snd_vortex_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
}
/* pointer callback */
}
/* pointer callback */
-static snd_pcm_uframes_t snd_vortex_pcm_pointer(s
nd_pcm_substream_t *
substream)
+static snd_pcm_uframes_t snd_vortex_pcm_pointer(s
truct snd_pcm_substream *
substream)
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) substream->runtime->private_data;
{
vortex_t *chip = snd_pcm_substream_chip(substream);
stream_t *stream = (stream_t *) substream->runtime->private_data;
@@
-395,13
+395,13
@@
static snd_pcm_uframes_t snd_vortex_pcm_pointer(snd_pcm_substream_t * substream)
/* Page callback. */
/*
/* Page callback. */
/*
-static struct page *snd_pcm_sgbuf_ops_page(s
nd_pcm_substream_t
*substream, unsigned long offset) {
+static struct page *snd_pcm_sgbuf_ops_page(s
truct snd_pcm_substream
*substream, unsigned long offset) {
}
*/
/* operators */
}
*/
/* operators */
-static s
nd_pcm_ops_t
snd_vortex_playback_ops = {
+static s
truct snd_pcm_ops
snd_vortex_playback_ops = {
.open = snd_vortex_pcm_open,
.close = snd_vortex_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.open = snd_vortex_pcm_open,
.close = snd_vortex_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
@@
-434,14
+434,14
@@
static char *vortex_pcm_name[VORTEX_PCM_LAST] = {
/* SPDIF kcontrol */
/* SPDIF kcontrol */
-static int snd_vortex_spdif_info(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+static int snd_vortex_spdif_info(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *
uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
-static int snd_vortex_spdif_mask_get(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_vortex_spdif_mask_get(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *
ucontrol)
{
ucontrol->value.iec958.status[0] = 0xff;
ucontrol->value.iec958.status[1] = 0xff;
{
ucontrol->value.iec958.status[0] = 0xff;
ucontrol->value.iec958.status[1] = 0xff;
@@
-450,7
+450,7
@@
static int snd_vortex_spdif_mask_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_val
return 0;
}
return 0;
}
-static int snd_vortex_spdif_get(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_vortex_spdif_get(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *
ucontrol)
{
vortex_t *vortex = snd_kcontrol_chip(kcontrol);
ucontrol->value.iec958.status[0] = 0x00;
{
vortex_t *vortex = snd_kcontrol_chip(kcontrol);
ucontrol->value.iec958.status[0] = 0x00;
@@
-464,7
+464,7
@@
static int snd_vortex_spdif_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return 0;
}
return 0;
}
-static int snd_vortex_spdif_put(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_vortex_spdif_put(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *
ucontrol)
{
vortex_t *vortex = snd_kcontrol_chip(kcontrol);
int spdif_sr = 48000;
{
vortex_t *vortex = snd_kcontrol_chip(kcontrol);
int spdif_sr = 48000;
@@
-481,7
+481,7
@@
static int snd_vortex_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
/* spdif controls */
}
/* spdif controls */
-static s
nd_kcontrol_new_t
snd_vortex_mixer_spdif[] __devinitdata = {
+static s
truct snd_kcontrol_new
snd_vortex_mixer_spdif[] __devinitdata = {
{
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
{
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
@@
-501,8
+501,8
@@
static snd_kcontrol_new_t snd_vortex_mixer_spdif[] __devinitdata = {
/* create a pcm device */
static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
{
/* create a pcm device */
static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
{
- s
nd_pcm_t
*pcm;
- s
nd_kcontrol_t
*kctl;
+ s
truct snd_pcm
*pcm;
+ s
truct snd_kcontrol
*kctl;
int i;
int err, nr_capt;
int i;
int err, nr_capt;