aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/opl4/opl4_mixer.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:13:47 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:06 -0500
commita42dd420bea7a5cd130162183d95f640c299a337 (patch)
treeb9c8a88c957b973faf3e5a4faf027a39a0d8343f /sound/drivers/opl4/opl4_mixer.c
parent5b1646a8eceff0a4ff06f309abb6e7f43f99a498 (diff)
[ALSA] Remove xxx_t typedefs: OPL4
Modules: OPL4 Remove xxx_t typedefs from the OPL4 driver Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/opl4/opl4_mixer.c')
-rw-r--r--sound/drivers/opl4/opl4_mixer.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/drivers/opl4/opl4_mixer.c b/sound/drivers/opl4/opl4_mixer.c
index ec7a228fbe7e..04079de4c35f 100644
--- a/sound/drivers/opl4/opl4_mixer.c
+++ b/sound/drivers/opl4/opl4_mixer.c
@@ -20,7 +20,7 @@
20#include "opl4_local.h" 20#include "opl4_local.h"
21#include <sound/control.h> 21#include <sound/control.h>
22 22
23static int snd_opl4_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) 23static int snd_opl4_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
24{ 24{
25 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; 25 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
26 uinfo->count = 2; 26 uinfo->count = 2;
@@ -29,9 +29,9 @@ static int snd_opl4_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinf
29 return 0; 29 return 0;
30} 30}
31 31
32static int snd_opl4_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) 32static int snd_opl4_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
33{ 33{
34 opl4_t *opl4 = snd_kcontrol_chip(kcontrol); 34 struct snd_opl4 *opl4 = snd_kcontrol_chip(kcontrol);
35 unsigned long flags; 35 unsigned long flags;
36 u8 reg = kcontrol->private_value; 36 u8 reg = kcontrol->private_value;
37 u8 value; 37 u8 value;
@@ -44,9 +44,9 @@ static int snd_opl4_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon
44 return 0; 44 return 0;
45} 45}
46 46
47static int snd_opl4_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) 47static int snd_opl4_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
48{ 48{
49 opl4_t *opl4 = snd_kcontrol_chip(kcontrol); 49 struct snd_opl4 *opl4 = snd_kcontrol_chip(kcontrol);
50 unsigned long flags; 50 unsigned long flags;
51 u8 reg = kcontrol->private_value; 51 u8 reg = kcontrol->private_value;
52 u8 value, old_value; 52 u8 value, old_value;
@@ -60,7 +60,7 @@ static int snd_opl4_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon
60 return value != old_value; 60 return value != old_value;
61} 61}
62 62
63static snd_kcontrol_new_t snd_opl4_controls[] = { 63static struct snd_kcontrol_new snd_opl4_controls[] = {
64 { 64 {
65 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 65 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
66 .name = "FM Playback Volume", 66 .name = "FM Playback Volume",
@@ -79,9 +79,9 @@ static snd_kcontrol_new_t snd_opl4_controls[] = {
79 } 79 }
80}; 80};
81 81
82int snd_opl4_create_mixer(opl4_t *opl4) 82int snd_opl4_create_mixer(struct snd_opl4 *opl4)
83{ 83{
84 snd_card_t *card = opl4->card; 84 struct snd_card *card = opl4->card;
85 int i, err; 85 int i, err;
86 86
87 strcat(card->mixername, ",OPL4"); 87 strcat(card->mixername, ",OPL4");