OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] Fix snd_xxx_t typedefs 

Modules: PXA Mainstone driver,CX88 driver,SAA7134 driver

Replace snd_xxx_t typedefs with explicit structs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2006-01-13 18:48:06 +01:00 committed by Jaroslav Kysela
parent 97c67b65cb
commit f7cbb7fcd3
5 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-pxa/mainstone.c
View File

@ -157,14 +157,14 @@ static struct platform_device smc91x_device = {
.resource = smc91x_resources, .resource = smc91x_resources,
}; };
static int mst_audio_startup(snd_pcm_substream_t *substream, void *priv) static int mst_audio_startup(struct snd_pcm_substream *substream, void *priv)
{ {
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
MST_MSCWR2 &= ~MST_MSCWR2_AC97_SPKROFF; MST_MSCWR2 &= ~MST_MSCWR2_AC97_SPKROFF;
return 0; return 0;
} }
static void mst_audio_shutdown(snd_pcm_substream_t *substream, void *priv) static void mst_audio_shutdown(struct snd_pcm_substream *substream, void *priv)
{ {
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
MST_MSCWR2 |= MST_MSCWR2_AC97_SPKROFF; MST_MSCWR2 |= MST_MSCWR2_AC97_SPKROFF;

54
drivers/media/video/cx88/cx88-alsa.c
View File

@ -63,7 +63,7 @@ struct cx88_audio_dev {
/* audio controls */ /* audio controls */
int irq; int irq;
snd_card_t *card; struct snd_card *card;
spinlock_t reg_lock; spinlock_t reg_lock;
@ -82,7 +82,7 @@ struct cx88_audio_dev {
struct cx88_buffer *buf; struct cx88_buffer *buf;
long opened; long opened;
snd_pcm_substream_t *substream; struct snd_pcm_substream *substream;
}; };
typedef struct cx88_audio_dev snd_cx88_card_t; typedef struct cx88_audio_dev snd_cx88_card_t;
@ -96,7 +96,7 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1}; static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
static snd_card_t *snd_cx88_cards[SNDRV_CARDS]; static struct snd_card *snd_cx88_cards[SNDRV_CARDS];
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable cx88x soundcard. default enabled."); MODULE_PARM_DESC(enable, "Enable cx88x soundcard. default enabled.");
@ -320,7 +320,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip)
/* /*
* Digital hardware definition * Digital hardware definition
*/ */
static snd_pcm_hardware_t snd_cx88_digital_hw = { static struct snd_pcm_hardware snd_cx88_digital_hw = {
.info = SNDRV_PCM_INFO_MMAP | .info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@ -342,16 +342,16 @@ static snd_pcm_hardware_t snd_cx88_digital_hw = {
/* /*
* audio pcm capture runtime free * audio pcm capture runtime free
*/ */
static void snd_card_cx88_runtime_free(snd_pcm_runtime_t *runtime) static void snd_card_cx88_runtime_free(struct snd_pcm_runtime *runtime)
{ {
} }
/* /*
* audio pcm capture open callback * audio pcm capture open callback
*/ */
static int snd_cx88_pcm_open(snd_pcm_substream_t *substream) static int snd_cx88_pcm_open(struct snd_pcm_substream *substream)
{ {
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream); snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int err; int err;
if (test_and_set_bit(0, &chip->opened)) if (test_and_set_bit(0, &chip->opened))
@ -380,7 +380,7 @@ _error:
/* /*
* audio close callback * audio close callback
*/ */
static int snd_cx88_close(snd_pcm_substream_t *substream) static int snd_cx88_close(struct snd_pcm_substream *substream)
{ {
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream); snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
@ -393,8 +393,8 @@ static int snd_cx88_close(snd_pcm_substream_t *substream)
/* /*
* hw_params callback * hw_params callback
*/ */
static int snd_cx88_hw_params(snd_pcm_substream_t * substream, static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
snd_pcm_hw_params_t * hw_params) struct snd_pcm_hw_params * hw_params)
{ {
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream); snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
struct cx88_buffer *buf; struct cx88_buffer *buf;
@ -453,7 +453,7 @@ static int snd_cx88_hw_params(snd_pcm_substream_t * substream,
/* /*
* hw free callback * hw free callback
*/ */
static int snd_cx88_hw_free(snd_pcm_substream_t * substream) static int snd_cx88_hw_free(struct snd_pcm_substream * substream)
{ {
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream); snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
@ -469,7 +469,7 @@ static int snd_cx88_hw_free(snd_pcm_substream_t * substream)
/* /*
* prepare callback * prepare callback
*/ */
static int snd_cx88_prepare(snd_pcm_substream_t *substream) static int snd_cx88_prepare(struct snd_pcm_substream *substream)
{ {
return 0; return 0;
} }
@ -478,7 +478,7 @@ static int snd_cx88_prepare(snd_pcm_substream_t *substream)
/* /*
* trigger callback * trigger callback
*/ */
static int snd_cx88_card_trigger(snd_pcm_substream_t *substream, int cmd) static int snd_cx88_card_trigger(struct snd_pcm_substream *substream, int cmd)
{ {
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream); snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
int err; int err;
@ -505,10 +505,10 @@ static int snd_cx88_card_trigger(snd_pcm_substream_t *substream, int cmd)
/* /*
* pointer callback * pointer callback
*/ */
static snd_pcm_uframes_t snd_cx88_pointer(snd_pcm_substream_t *substream) static snd_pcm_uframes_t snd_cx88_pointer(struct snd_pcm_substream *substream)
{ {
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream); snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
if (chip->read_count) { if (chip->read_count) {
chip->read_count -= snd_pcm_lib_period_bytes(substream); chip->read_count -= snd_pcm_lib_period_bytes(substream);
@ -525,7 +525,7 @@ static snd_pcm_uframes_t snd_cx88_pointer(snd_pcm_substream_t *substream)
/* /*
* operators * operators
*/ */
static snd_pcm_ops_t snd_cx88_pcm_ops = { static struct snd_pcm_ops snd_cx88_pcm_ops = {
.open = snd_cx88_pcm_open, .open = snd_cx88_pcm_open,
.close = snd_cx88_close, .close = snd_cx88_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
@ -542,7 +542,7 @@ static snd_pcm_ops_t snd_cx88_pcm_ops = {
static int __devinit snd_cx88_pcm(snd_cx88_card_t *chip, int device, char *name) static int __devinit snd_cx88_pcm(snd_cx88_card_t *chip, int device, char *name)
{ {
int err; int err;
snd_pcm_t *pcm; struct snd_pcm *pcm;
err = snd_pcm_new(chip->card, name, device, 0, 1, &pcm); err = snd_pcm_new(chip->card, name, device, 0, 1, &pcm);
if (err < 0) if (err < 0)
@ -557,7 +557,8 @@ static int __devinit snd_cx88_pcm(snd_cx88_card_t *chip, int device, char *name)
/**************************************************************************** /****************************************************************************
CONTROL INTERFACE CONTROL INTERFACE
****************************************************************************/ ****************************************************************************/
static int snd_cx88_capture_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *info) static int snd_cx88_capture_volume_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *info)
{ {
info->type = SNDRV_CTL_ELEM_TYPE_INTEGER; info->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
info->count = 1; info->count = 1;
@ -568,7 +569,8 @@ static int snd_cx88_capture_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_i
} }
/* OK - TODO: test it */ /* OK - TODO: test it */
static int snd_cx88_capture_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *value) static int snd_cx88_capture_volume_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *value)
{ {
snd_cx88_card_t *chip = snd_kcontrol_chip(kcontrol); snd_cx88_card_t *chip = snd_kcontrol_chip(kcontrol);
struct cx88_core *core=chip->core; struct cx88_core *core=chip->core;
@ -579,7 +581,8 @@ static int snd_cx88_capture_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
} }
/* OK - TODO: test it */ /* OK - TODO: test it */
static int snd_cx88_capture_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *value) static int snd_cx88_capture_volume_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *value)
{ {
snd_cx88_card_t *chip = snd_kcontrol_chip(kcontrol); snd_cx88_card_t *chip = snd_kcontrol_chip(kcontrol);
struct cx88_core *core=chip->core; struct cx88_core *core=chip->core;
@ -595,7 +598,7 @@ static int snd_cx88_capture_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
return v != old_control; return v != old_control;
} }
static snd_kcontrol_new_t snd_cx88_capture_volume = { static struct snd_kcontrol_new snd_cx88_capture_volume = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Capture Volume", .name = "Capture Volume",
.info = snd_cx88_capture_volume_info, .info = snd_cx88_capture_volume_info,
@ -641,7 +644,7 @@ static int snd_cx88_free(snd_cx88_card_t *chip)
/* /*
* Component Destructor * Component Destructor
*/ */
static void snd_cx88_dev_free(snd_card_t * card) static void snd_cx88_dev_free(struct snd_card * card)
{ {
snd_cx88_card_t *chip = card->private_data; snd_cx88_card_t *chip = card->private_data;
@ -654,8 +657,9 @@ static void snd_cx88_dev_free(snd_card_t * card)
*/ */
static int devno; static int devno;
static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci, static int __devinit snd_cx88_create(struct snd_card *card,
snd_cx88_card_t **rchip) struct pci_dev *pci,
snd_cx88_card_t **rchip)
{ {
snd_cx88_card_t *chip; snd_cx88_card_t *chip;
struct cx88_core *core; struct cx88_core *core;
@ -726,7 +730,7 @@ static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
static int __devinit cx88_audio_initdev(struct pci_dev *pci, static int __devinit cx88_audio_initdev(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
snd_card_t *card; struct snd_card *card;
snd_cx88_card_t *chip; snd_cx88_card_t *chip;
int err; int err;

65
drivers/media/video/saa7134/saa7134-alsa.c
View File

@ -71,7 +71,7 @@ MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s).");
*/ */
typedef struct snd_card_saa7134 { typedef struct snd_card_saa7134 {
snd_card_t *card; struct snd_card *card;
spinlock_t mixer_lock; spinlock_t mixer_lock;
int mixer_volume[MIXER_ADDR_LAST+1][2]; int mixer_volume[MIXER_ADDR_LAST+1][2];
int capture_source[MIXER_ADDR_LAST+1][2]; int capture_source[MIXER_ADDR_LAST+1][2];
@ -95,10 +95,10 @@ typedef struct snd_card_saa7134_pcm {
spinlock_t lock; spinlock_t lock;
snd_pcm_substream_t *substream; struct snd_pcm_substream *substream;
} snd_card_saa7134_pcm_t; } snd_card_saa7134_pcm_t;
static snd_card_t *snd_saa7134_cards[SNDRV_CARDS]; static struct snd_card *snd_saa7134_cards[SNDRV_CARDS];
/* /*
@ -251,10 +251,10 @@ out:
* *
*/ */
static int snd_card_saa7134_capture_trigger(snd_pcm_substream_t * substream, static int snd_card_saa7134_capture_trigger(struct snd_pcm_substream * substream,
int cmd) int cmd)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_card_saa7134_pcm_t *pcm = runtime->private_data; snd_card_saa7134_pcm_t *pcm = runtime->private_data;
struct saa7134_dev *dev=pcm->dev; struct saa7134_dev *dev=pcm->dev;
int err = 0; int err = 0;
@ -333,9 +333,9 @@ static int dsp_buffer_free(struct saa7134_dev *dev)
* *
*/ */
static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream) static int snd_card_saa7134_capture_prepare(struct snd_pcm_substream * substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int bswap, sign; int bswap, sign;
u32 fmt, control; u32 fmt, control;
snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream); snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
@ -422,9 +422,10 @@ static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream)
* *
*/ */
static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t * substream) static snd_pcm_uframes_t
snd_card_saa7134_capture_pointer(struct snd_pcm_substream * substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_card_saa7134_pcm_t *pcm = runtime->private_data; snd_card_saa7134_pcm_t *pcm = runtime->private_data;
struct saa7134_dev *dev=pcm->dev; struct saa7134_dev *dev=pcm->dev;
@ -442,7 +443,7 @@ static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t *
* ALSA hardware capabilities definition * ALSA hardware capabilities definition
*/ */
static snd_pcm_hardware_t snd_card_saa7134_capture = static struct snd_pcm_hardware snd_card_saa7134_capture =
{ {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@ -465,7 +466,7 @@ static snd_pcm_hardware_t snd_card_saa7134_capture =
.periods_max = 1024, .periods_max = 1024,
}; };
static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime) static void snd_card_saa7134_runtime_free(struct snd_pcm_runtime *runtime)
{ {
snd_card_saa7134_pcm_t *pcm = runtime->private_data; snd_card_saa7134_pcm_t *pcm = runtime->private_data;
@ -482,8 +483,8 @@ static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime)
* *
*/ */
static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream, static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
snd_pcm_hw_params_t * hw_params) struct snd_pcm_hw_params * hw_params)
{ {
snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream); snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
struct saa7134_dev *dev; struct saa7134_dev *dev;
@ -562,7 +563,7 @@ static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
* *
*/ */
static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream) static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
{ {
snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream); snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
struct saa7134_dev *dev; struct saa7134_dev *dev;
@ -588,7 +589,7 @@ static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream)
* *
*/ */
static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream) static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream)
{ {
return 0; return 0;
} }
@ -603,9 +604,9 @@ static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream)
* *
*/ */
static int snd_card_saa7134_capture_open(snd_pcm_substream_t * substream) static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_card_saa7134_pcm_t *pcm; snd_card_saa7134_pcm_t *pcm;
snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream); snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
struct saa7134_dev *dev = saa7134->dev; struct saa7134_dev *dev = saa7134->dev;
@ -641,7 +642,7 @@ static int snd_card_saa7134_capture_open(snd_pcm_substream_t * substream)
* ALSA capture callbacks definition * ALSA capture callbacks definition
*/ */
static snd_pcm_ops_t snd_card_saa7134_capture_ops = { static struct snd_pcm_ops snd_card_saa7134_capture_ops = {
.open = snd_card_saa7134_capture_open, .open = snd_card_saa7134_capture_open,
.close = snd_card_saa7134_capture_close, .close = snd_card_saa7134_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
@ -662,7 +663,7 @@ static snd_pcm_ops_t snd_card_saa7134_capture_ops = {
static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device) static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
int err; int err;
if ((err = snd_pcm_new(saa7134->card, "SAA7134 PCM", device, 0, 1, &pcm)) < 0) if ((err = snd_pcm_new(saa7134->card, "SAA7134 PCM", device, 0, 1, &pcm)) < 0)
@ -680,7 +681,8 @@ static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
.get = snd_saa7134_volume_get, .put = snd_saa7134_volume_put, \ .get = snd_saa7134_volume_get, .put = snd_saa7134_volume_put, \
.private_value = addr } .private_value = addr }
static int snd_saa7134_volume_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_saa7134_volume_info(struct snd_kcontrol * kcontrol,
struct snd_ctl_elem_info * uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 2; uinfo->count = 2;
@ -689,7 +691,8 @@ static int snd_saa7134_volume_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_
return 0; return 0;
} }
static int snd_saa7134_volume_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_saa7134_volume_get(struct snd_kcontrol * kcontrol,
struct snd_ctl_elem_value * ucontrol)
{ {
snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol); snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
int addr = kcontrol->private_value; int addr = kcontrol->private_value;
@ -699,7 +702,8 @@ static int snd_saa7134_volume_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
return 0; return 0;
} }
static int snd_saa7134_volume_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_saa7134_volume_put(struct snd_kcontrol * kcontrol,
struct snd_ctl_elem_value * ucontrol)
{ {
snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol); snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
int change, addr = kcontrol->private_value; int change, addr = kcontrol->private_value;
@ -730,7 +734,8 @@ static int snd_saa7134_volume_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
.get = snd_saa7134_capsrc_get, .put = snd_saa7134_capsrc_put, \ .get = snd_saa7134_capsrc_get, .put = snd_saa7134_capsrc_put, \
.private_value = addr } .private_value = addr }
static int snd_saa7134_capsrc_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_saa7134_capsrc_info(struct snd_kcontrol * kcontrol,
struct snd_ctl_elem_info * uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 2; uinfo->count = 2;
@ -739,7 +744,8 @@ static int snd_saa7134_capsrc_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_
return 0; return 0;
} }
static int snd_saa7134_capsrc_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_saa7134_capsrc_get(struct snd_kcontrol * kcontrol,
struct snd_ctl_elem_value * ucontrol)
{ {
snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol); snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
int addr = kcontrol->private_value; int addr = kcontrol->private_value;
@ -752,7 +758,8 @@ static int snd_saa7134_capsrc_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
return 0; return 0;
} }
static int snd_saa7134_capsrc_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
struct snd_ctl_elem_value * ucontrol)
{ {
snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol); snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
int change, addr = kcontrol->private_value; int change, addr = kcontrol->private_value;
@ -829,7 +836,7 @@ static int snd_saa7134_capsrc_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
return change; return change;
} }
static snd_kcontrol_new_t snd_saa7134_controls[] = { static struct snd_kcontrol_new snd_saa7134_controls[] = {
SAA713x_VOLUME("Video Volume", 0, MIXER_ADDR_TVTUNER), SAA713x_VOLUME("Video Volume", 0, MIXER_ADDR_TVTUNER),
SAA713x_CAPSRC("Video Capture Switch", 0, MIXER_ADDR_TVTUNER), SAA713x_CAPSRC("Video Capture Switch", 0, MIXER_ADDR_TVTUNER),
SAA713x_VOLUME("Line Volume", 1, MIXER_ADDR_LINE1), SAA713x_VOLUME("Line Volume", 1, MIXER_ADDR_LINE1),
@ -848,7 +855,7 @@ SAA713x_CAPSRC("Line Capture Switch", 2, MIXER_ADDR_LINE2),
static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip) static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
{ {
snd_card_t *card = chip->card; struct snd_card *card = chip->card;
unsigned int idx; unsigned int idx;
int err; int err;
@ -862,7 +869,7 @@ static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
return 0; return 0;
} }
static void snd_saa7134_free(snd_card_t * card) static void snd_saa7134_free(struct snd_card * card)
{ {
snd_card_saa7134_t *chip = card->private_data; snd_card_saa7134_t *chip = card->private_data;
@ -889,7 +896,7 @@ static void snd_saa7134_free(snd_card_t * card)
static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
{ {
snd_card_t *card; struct snd_card *card;
snd_card_saa7134_t *chip; snd_card_saa7134_t *chip;
int err; int err;

2
drivers/media/video/saa7134/saa7134.h
View File

@ -386,7 +386,7 @@ struct saa7134_dmasound {
unsigned int read_offset; unsigned int read_offset;
unsigned int read_count; unsigned int read_count;
void * priv_data; void * priv_data;
snd_pcm_substream_t *substream; struct snd_pcm_substream *substream;
}; };
/* IR input */ /* IR input */

4
include/asm-arm/arch-pxa/audio.h
View File

@ -6,8 +6,8 @@
#include <sound/pcm.h> #include <sound/pcm.h>
typedef struct { typedef struct {
int (*startup)(snd_pcm_substream_t *, void *); int (*startup)(struct snd_pcm_substream *, void *);
void (*shutdown)(snd_pcm_substream_t *, void *); void (*shutdown)(struct snd_pcm_substream *, void *);
void (*suspend)(void *); void (*suspend)(void *);
void (*resume)(void *); void (*resume)(void *);
void *priv; void *priv;