diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:38:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:38:36 -0800 |
| commit | 4da5cc2cec8caec1d357053e85a7a32f243f93a1 (patch) | |
| tree | 3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6 /sound/drivers/opl4/opl4_mixer.c | |
| parent | 25c862cc9ea9b312c25a9f577f91b973131f1261 (diff) | |
| parent | c6f43290ae687c11cdcd150d8bfeb57ec29cfa5b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/drivers/opl4/opl4_mixer.c')
| -rw-r--r-- | sound/drivers/opl4/opl4_mixer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/drivers/opl4/opl4_mixer.c b/sound/drivers/opl4/opl4_mixer.c index ec7a228fbe7..04079de4c35 100644 --- a/sound/drivers/opl4/opl4_mixer.c +++ b/sound/drivers/opl4/opl4_mixer.c @@ -20,7 +20,7 @@ #include "opl4_local.h" #include <sound/control.h> -static int snd_opl4_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) +static int snd_opl4_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->count = 2; @@ -29,9 +29,9 @@ static int snd_opl4_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinf return 0; } -static int snd_opl4_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) +static int snd_opl4_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - opl4_t *opl4 = snd_kcontrol_chip(kcontrol); + struct snd_opl4 *opl4 = snd_kcontrol_chip(kcontrol); unsigned long flags; u8 reg = kcontrol->private_value; u8 value; @@ -44,9 +44,9 @@ static int snd_opl4_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon return 0; } -static int snd_opl4_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) +static int snd_opl4_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - opl4_t *opl4 = snd_kcontrol_chip(kcontrol); + struct snd_opl4 *opl4 = snd_kcontrol_chip(kcontrol); unsigned long flags; u8 reg = kcontrol->private_value; u8 value, old_value; @@ -60,7 +60,7 @@ static int snd_opl4_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon return value != old_value; } -static snd_kcontrol_new_t snd_opl4_controls[] = { +static struct snd_kcontrol_new snd_opl4_controls[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "FM Playback Volume", @@ -79,9 +79,9 @@ static snd_kcontrol_new_t snd_opl4_controls[] = { } }; -int snd_opl4_create_mixer(opl4_t *opl4) +int snd_opl4_create_mixer(struct snd_opl4 *opl4) { - snd_card_t *card = opl4->card; + struct snd_card *card = opl4->card; int i, err; strcat(card->mixername, ",OPL4"); |