diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 09:00:18 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:19:13 -0500 |
commit | ab0c7d72c32d703d1a2833ce2a1920cd3b46b131 (patch) | |
tree | 6d5ed4991fd9b463fa929899af0ddf0cde158def /sound/pci/ice1712/juli.c | |
parent | 6ca308d4edd51c4f34ffff94ae0bbf193087d89f (diff) |
[ALSA] Remove xxx_t typedefs: PCI ICE1724
Modules: ICE1724 driver,ICE1712 driver
Remove xxx_t typedefs from the PCI ICE1724 driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/juli.c')
-rw-r--r-- | sound/pci/ice1712/juli.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index a5e04a3136b1..5176b41ea9d3 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
@@ -65,30 +65,30 @@ | |||
65 | 65 | ||
66 | static void juli_ak4114_write(void *private_data, unsigned char reg, unsigned char val) | 66 | static void juli_ak4114_write(void *private_data, unsigned char reg, unsigned char val) |
67 | { | 67 | { |
68 | snd_vt1724_write_i2c((ice1712_t *)private_data, AK4114_ADDR, reg, val); | 68 | snd_vt1724_write_i2c((struct snd_ice1712 *)private_data, AK4114_ADDR, reg, val); |
69 | } | 69 | } |
70 | 70 | ||
71 | static unsigned char juli_ak4114_read(void *private_data, unsigned char reg) | 71 | static unsigned char juli_ak4114_read(void *private_data, unsigned char reg) |
72 | { | 72 | { |
73 | return snd_vt1724_read_i2c((ice1712_t *)private_data, AK4114_ADDR, reg); | 73 | return snd_vt1724_read_i2c((struct snd_ice1712 *)private_data, AK4114_ADDR, reg); |
74 | } | 74 | } |
75 | 75 | ||
76 | /* | 76 | /* |
77 | * AK4358 section | 77 | * AK4358 section |
78 | */ | 78 | */ |
79 | 79 | ||
80 | static void juli_akm_lock(akm4xxx_t *ak, int chip) | 80 | static void juli_akm_lock(struct snd_akm4xxx *ak, int chip) |
81 | { | 81 | { |
82 | } | 82 | } |
83 | 83 | ||
84 | static void juli_akm_unlock(akm4xxx_t *ak, int chip) | 84 | static void juli_akm_unlock(struct snd_akm4xxx *ak, int chip) |
85 | { | 85 | { |
86 | } | 86 | } |
87 | 87 | ||
88 | static void juli_akm_write(akm4xxx_t *ak, int chip, | 88 | static void juli_akm_write(struct snd_akm4xxx *ak, int chip, |
89 | unsigned char addr, unsigned char data) | 89 | unsigned char addr, unsigned char data) |
90 | { | 90 | { |
91 | ice1712_t *ice = ak->private_data[0]; | 91 | struct snd_ice1712 *ice = ak->private_data[0]; |
92 | 92 | ||
93 | snd_assert(chip == 0, return); | 93 | snd_assert(chip == 0, return); |
94 | snd_vt1724_write_i2c(ice, AK4358_ADDR, addr, data); | 94 | snd_vt1724_write_i2c(ice, AK4358_ADDR, addr, data); |
@@ -97,7 +97,7 @@ static void juli_akm_write(akm4xxx_t *ak, int chip, | |||
97 | /* | 97 | /* |
98 | * change the rate of envy24HT, AK4358 | 98 | * change the rate of envy24HT, AK4358 |
99 | */ | 99 | */ |
100 | static void juli_akm_set_rate_val(akm4xxx_t *ak, unsigned int rate) | 100 | static void juli_akm_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate) |
101 | { | 101 | { |
102 | unsigned char old, tmp, dfs; | 102 | unsigned char old, tmp, dfs; |
103 | 103 | ||
@@ -125,7 +125,7 @@ static void juli_akm_set_rate_val(akm4xxx_t *ak, unsigned int rate) | |||
125 | snd_akm4xxx_reset(ak, 0); | 125 | snd_akm4xxx_reset(ak, 0); |
126 | } | 126 | } |
127 | 127 | ||
128 | static akm4xxx_t akm_juli_dac __devinitdata = { | 128 | static struct snd_akm4xxx akm_juli_dac __devinitdata = { |
129 | .type = SND_AK4358, | 129 | .type = SND_AK4358, |
130 | .num_dacs = 2, | 130 | .num_dacs = 2, |
131 | .ops = { | 131 | .ops = { |
@@ -136,7 +136,7 @@ static akm4xxx_t akm_juli_dac __devinitdata = { | |||
136 | } | 136 | } |
137 | }; | 137 | }; |
138 | 138 | ||
139 | static int __devinit juli_add_controls(ice1712_t *ice) | 139 | static int __devinit juli_add_controls(struct snd_ice1712 *ice) |
140 | { | 140 | { |
141 | return snd_ice1712_akm4xxx_build_controls(ice); | 141 | return snd_ice1712_akm4xxx_build_controls(ice); |
142 | } | 142 | } |
@@ -144,7 +144,7 @@ static int __devinit juli_add_controls(ice1712_t *ice) | |||
144 | /* | 144 | /* |
145 | * initialize the chip | 145 | * initialize the chip |
146 | */ | 146 | */ |
147 | static int __devinit juli_init(ice1712_t *ice) | 147 | static int __devinit juli_init(struct snd_ice1712 *ice) |
148 | { | 148 | { |
149 | static unsigned char ak4114_init_vals[] = { | 149 | static unsigned char ak4114_init_vals[] = { |
150 | /* AK4117_REG_PWRDN */ AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, | 150 | /* AK4117_REG_PWRDN */ AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, |
@@ -158,7 +158,7 @@ static int __devinit juli_init(ice1712_t *ice) | |||
158 | 0x41, 0x02, 0x2c, 0x00, 0x00 | 158 | 0x41, 0x02, 0x2c, 0x00, 0x00 |
159 | }; | 159 | }; |
160 | int err; | 160 | int err; |
161 | akm4xxx_t *ak; | 161 | struct snd_akm4xxx *ak; |
162 | 162 | ||
163 | #if 0 | 163 | #if 0 |
164 | for (err = 0; err < 0x20; err++) | 164 | for (err = 0; err < 0x20; err++) |
@@ -189,7 +189,7 @@ static int __devinit juli_init(ice1712_t *ice) | |||
189 | ice->num_total_dacs = 2; | 189 | ice->num_total_dacs = 2; |
190 | ice->num_total_adcs = 2; | 190 | ice->num_total_adcs = 2; |
191 | 191 | ||
192 | ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); | 192 | ak = ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); |
193 | if (! ak) | 193 | if (! ak) |
194 | return -ENOMEM; | 194 | return -ENOMEM; |
195 | ice->akm_codecs = 1; | 195 | ice->akm_codecs = 1; |