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/pontis.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/pontis.c')
-rw-r--r-- | sound/pci/ice1712/pontis.c | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index 773a1ecb75ce..0dccd7707a4b 100644 --- a/sound/pci/ice1712/pontis.c +++ b/sound/pci/ice1712/pontis.c | |||
@@ -76,7 +76,7 @@ | |||
76 | /* | 76 | /* |
77 | * get the current register value of WM codec | 77 | * get the current register value of WM codec |
78 | */ | 78 | */ |
79 | static unsigned short wm_get(ice1712_t *ice, int reg) | 79 | static unsigned short wm_get(struct snd_ice1712 *ice, int reg) |
80 | { | 80 | { |
81 | reg <<= 1; | 81 | reg <<= 1; |
82 | return ((unsigned short)ice->akm[0].images[reg] << 8) | | 82 | return ((unsigned short)ice->akm[0].images[reg] << 8) | |
@@ -86,14 +86,14 @@ static unsigned short wm_get(ice1712_t *ice, int reg) | |||
86 | /* | 86 | /* |
87 | * set the register value of WM codec and remember it | 87 | * set the register value of WM codec and remember it |
88 | */ | 88 | */ |
89 | static void wm_put_nocache(ice1712_t *ice, int reg, unsigned short val) | 89 | static void wm_put_nocache(struct snd_ice1712 *ice, int reg, unsigned short val) |
90 | { | 90 | { |
91 | unsigned short cval; | 91 | unsigned short cval; |
92 | cval = (reg << 9) | val; | 92 | cval = (reg << 9) | val; |
93 | snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff); | 93 | snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff); |
94 | } | 94 | } |
95 | 95 | ||
96 | static void wm_put(ice1712_t *ice, int reg, unsigned short val) | 96 | static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val) |
97 | { | 97 | { |
98 | wm_put_nocache(ice, reg, val); | 98 | wm_put_nocache(ice, reg, val); |
99 | reg <<= 1; | 99 | reg <<= 1; |
@@ -109,7 +109,7 @@ static void wm_put(ice1712_t *ice, int reg, unsigned short val) | |||
109 | #define DAC_RES 128 | 109 | #define DAC_RES 128 |
110 | #define DAC_MIN (DAC_0dB - DAC_RES) | 110 | #define DAC_MIN (DAC_0dB - DAC_RES) |
111 | 111 | ||
112 | static int wm_dac_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 112 | static int wm_dac_vol_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
113 | { | 113 | { |
114 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 114 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
115 | uinfo->count = 2; | 115 | uinfo->count = 2; |
@@ -118,9 +118,9 @@ static int wm_dac_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | |||
118 | return 0; | 118 | return 0; |
119 | } | 119 | } |
120 | 120 | ||
121 | static int wm_dac_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 121 | static int wm_dac_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
122 | { | 122 | { |
123 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 123 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
124 | unsigned short val; | 124 | unsigned short val; |
125 | int i; | 125 | int i; |
126 | 126 | ||
@@ -134,9 +134,9 @@ static int wm_dac_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontr | |||
134 | return 0; | 134 | return 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | static int wm_dac_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 137 | static int wm_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
138 | { | 138 | { |
139 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 139 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
140 | unsigned short oval, nval; | 140 | unsigned short oval, nval; |
141 | int i, idx, change = 0; | 141 | int i, idx, change = 0; |
142 | 142 | ||
@@ -164,7 +164,7 @@ static int wm_dac_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontr | |||
164 | #define ADC_RES 128 | 164 | #define ADC_RES 128 |
165 | #define ADC_MIN (ADC_0dB - ADC_RES) | 165 | #define ADC_MIN (ADC_0dB - ADC_RES) |
166 | 166 | ||
167 | static int wm_adc_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 167 | static int wm_adc_vol_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
168 | { | 168 | { |
169 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 169 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
170 | uinfo->count = 2; | 170 | uinfo->count = 2; |
@@ -173,9 +173,9 @@ static int wm_adc_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | |||
173 | return 0; | 173 | return 0; |
174 | } | 174 | } |
175 | 175 | ||
176 | static int wm_adc_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 176 | static int wm_adc_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
177 | { | 177 | { |
178 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 178 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
179 | unsigned short val; | 179 | unsigned short val; |
180 | int i; | 180 | int i; |
181 | 181 | ||
@@ -189,9 +189,9 @@ static int wm_adc_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontr | |||
189 | return 0; | 189 | return 0; |
190 | } | 190 | } |
191 | 191 | ||
192 | static int wm_adc_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 192 | static int wm_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
193 | { | 193 | { |
194 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 194 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
195 | unsigned short ovol, nvol; | 195 | unsigned short ovol, nvol; |
196 | int i, idx, change = 0; | 196 | int i, idx, change = 0; |
197 | 197 | ||
@@ -213,7 +213,7 @@ static int wm_adc_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontr | |||
213 | /* | 213 | /* |
214 | * ADC input mux mixer control | 214 | * ADC input mux mixer control |
215 | */ | 215 | */ |
216 | static int wm_adc_mux_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 216 | static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
217 | { | 217 | { |
218 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 218 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
219 | uinfo->count = 1; | 219 | uinfo->count = 1; |
@@ -222,9 +222,9 @@ static int wm_adc_mux_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | |||
222 | return 0; | 222 | return 0; |
223 | } | 223 | } |
224 | 224 | ||
225 | static int wm_adc_mux_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 225 | static int wm_adc_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
226 | { | 226 | { |
227 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 227 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
228 | int bit = kcontrol->private_value; | 228 | int bit = kcontrol->private_value; |
229 | 229 | ||
230 | down(&ice->gpio_mutex); | 230 | down(&ice->gpio_mutex); |
@@ -233,9 +233,9 @@ static int wm_adc_mux_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucont | |||
233 | return 0; | 233 | return 0; |
234 | } | 234 | } |
235 | 235 | ||
236 | static int wm_adc_mux_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 236 | static int wm_adc_mux_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
237 | { | 237 | { |
238 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 238 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
239 | int bit = kcontrol->private_value; | 239 | int bit = kcontrol->private_value; |
240 | unsigned short oval, nval; | 240 | unsigned short oval, nval; |
241 | int change; | 241 | int change; |
@@ -257,7 +257,7 @@ static int wm_adc_mux_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucont | |||
257 | /* | 257 | /* |
258 | * Analog bypass (In -> Out) | 258 | * Analog bypass (In -> Out) |
259 | */ | 259 | */ |
260 | static int wm_bypass_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 260 | static int wm_bypass_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
261 | { | 261 | { |
262 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 262 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
263 | uinfo->count = 1; | 263 | uinfo->count = 1; |
@@ -266,9 +266,9 @@ static int wm_bypass_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | |||
266 | return 0; | 266 | return 0; |
267 | } | 267 | } |
268 | 268 | ||
269 | static int wm_bypass_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 269 | static int wm_bypass_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
270 | { | 270 | { |
271 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 271 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
272 | 272 | ||
273 | down(&ice->gpio_mutex); | 273 | down(&ice->gpio_mutex); |
274 | ucontrol->value.integer.value[0] = (wm_get(ice, WM_OUT_MUX) & 0x04) ? 1 : 0; | 274 | ucontrol->value.integer.value[0] = (wm_get(ice, WM_OUT_MUX) & 0x04) ? 1 : 0; |
@@ -276,9 +276,9 @@ static int wm_bypass_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontr | |||
276 | return 0; | 276 | return 0; |
277 | } | 277 | } |
278 | 278 | ||
279 | static int wm_bypass_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 279 | static int wm_bypass_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
280 | { | 280 | { |
281 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 281 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
282 | unsigned short val, oval; | 282 | unsigned short val, oval; |
283 | int change = 0; | 283 | int change = 0; |
284 | 284 | ||
@@ -299,7 +299,7 @@ static int wm_bypass_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontr | |||
299 | /* | 299 | /* |
300 | * Left/Right swap | 300 | * Left/Right swap |
301 | */ | 301 | */ |
302 | static int wm_chswap_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 302 | static int wm_chswap_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
303 | { | 303 | { |
304 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 304 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
305 | uinfo->count = 1; | 305 | uinfo->count = 1; |
@@ -308,9 +308,9 @@ static int wm_chswap_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | |||
308 | return 0; | 308 | return 0; |
309 | } | 309 | } |
310 | 310 | ||
311 | static int wm_chswap_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 311 | static int wm_chswap_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
312 | { | 312 | { |
313 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 313 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
314 | 314 | ||
315 | down(&ice->gpio_mutex); | 315 | down(&ice->gpio_mutex); |
316 | ucontrol->value.integer.value[0] = (wm_get(ice, WM_DAC_CTRL1) & 0xf0) != 0x90; | 316 | ucontrol->value.integer.value[0] = (wm_get(ice, WM_DAC_CTRL1) & 0xf0) != 0x90; |
@@ -318,9 +318,9 @@ static int wm_chswap_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontr | |||
318 | return 0; | 318 | return 0; |
319 | } | 319 | } |
320 | 320 | ||
321 | static int wm_chswap_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 321 | static int wm_chswap_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
322 | { | 322 | { |
323 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 323 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
324 | unsigned short val, oval; | 324 | unsigned short val, oval; |
325 | int change = 0; | 325 | int change = 0; |
326 | 326 | ||
@@ -343,7 +343,7 @@ static int wm_chswap_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontr | |||
343 | /* | 343 | /* |
344 | * write data in the SPI mode | 344 | * write data in the SPI mode |
345 | */ | 345 | */ |
346 | static void set_gpio_bit(ice1712_t *ice, unsigned int bit, int val) | 346 | static void set_gpio_bit(struct snd_ice1712 *ice, unsigned int bit, int val) |
347 | { | 347 | { |
348 | unsigned int tmp = snd_ice1712_gpio_read(ice); | 348 | unsigned int tmp = snd_ice1712_gpio_read(ice); |
349 | if (val) | 349 | if (val) |
@@ -353,7 +353,7 @@ static void set_gpio_bit(ice1712_t *ice, unsigned int bit, int val) | |||
353 | snd_ice1712_gpio_write(ice, tmp); | 353 | snd_ice1712_gpio_write(ice, tmp); |
354 | } | 354 | } |
355 | 355 | ||
356 | static void spi_send_byte(ice1712_t *ice, unsigned char data) | 356 | static void spi_send_byte(struct snd_ice1712 *ice, unsigned char data) |
357 | { | 357 | { |
358 | int i; | 358 | int i; |
359 | for (i = 0; i < 8; i++) { | 359 | for (i = 0; i < 8; i++) { |
@@ -367,7 +367,7 @@ static void spi_send_byte(ice1712_t *ice, unsigned char data) | |||
367 | } | 367 | } |
368 | } | 368 | } |
369 | 369 | ||
370 | static unsigned int spi_read_byte(ice1712_t *ice) | 370 | static unsigned int spi_read_byte(struct snd_ice1712 *ice) |
371 | { | 371 | { |
372 | int i; | 372 | int i; |
373 | unsigned int val = 0; | 373 | unsigned int val = 0; |
@@ -386,7 +386,7 @@ static unsigned int spi_read_byte(ice1712_t *ice) | |||
386 | } | 386 | } |
387 | 387 | ||
388 | 388 | ||
389 | static void spi_write(ice1712_t *ice, unsigned int dev, unsigned int reg, unsigned int data) | 389 | static void spi_write(struct snd_ice1712 *ice, unsigned int dev, unsigned int reg, unsigned int data) |
390 | { | 390 | { |
391 | snd_ice1712_gpio_set_dir(ice, PONTIS_CS_CS|PONTIS_CS_WDATA|PONTIS_CS_CLK); | 391 | snd_ice1712_gpio_set_dir(ice, PONTIS_CS_CS|PONTIS_CS_WDATA|PONTIS_CS_CLK); |
392 | snd_ice1712_gpio_set_mask(ice, ~(PONTIS_CS_CS|PONTIS_CS_WDATA|PONTIS_CS_CLK)); | 392 | snd_ice1712_gpio_set_mask(ice, ~(PONTIS_CS_CS|PONTIS_CS_WDATA|PONTIS_CS_CLK)); |
@@ -402,7 +402,7 @@ static void spi_write(ice1712_t *ice, unsigned int dev, unsigned int reg, unsign | |||
402 | snd_ice1712_gpio_set_dir(ice, ice->gpio.direction); | 402 | snd_ice1712_gpio_set_dir(ice, ice->gpio.direction); |
403 | } | 403 | } |
404 | 404 | ||
405 | static unsigned int spi_read(ice1712_t *ice, unsigned int dev, unsigned int reg) | 405 | static unsigned int spi_read(struct snd_ice1712 *ice, unsigned int dev, unsigned int reg) |
406 | { | 406 | { |
407 | unsigned int val; | 407 | unsigned int val; |
408 | snd_ice1712_gpio_set_dir(ice, PONTIS_CS_CS|PONTIS_CS_WDATA|PONTIS_CS_CLK); | 408 | snd_ice1712_gpio_set_dir(ice, PONTIS_CS_CS|PONTIS_CS_WDATA|PONTIS_CS_CLK); |
@@ -429,7 +429,7 @@ static unsigned int spi_read(ice1712_t *ice, unsigned int dev, unsigned int reg) | |||
429 | /* | 429 | /* |
430 | * SPDIF input source | 430 | * SPDIF input source |
431 | */ | 431 | */ |
432 | static int cs_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 432 | static int cs_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
433 | { | 433 | { |
434 | static char *texts[] = { | 434 | static char *texts[] = { |
435 | "Coax", /* RXP0 */ | 435 | "Coax", /* RXP0 */ |
@@ -445,9 +445,9 @@ static int cs_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | |||
445 | return 0; | 445 | return 0; |
446 | } | 446 | } |
447 | 447 | ||
448 | static int cs_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 448 | static int cs_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
449 | { | 449 | { |
450 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 450 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
451 | 451 | ||
452 | down(&ice->gpio_mutex); | 452 | down(&ice->gpio_mutex); |
453 | ucontrol->value.enumerated.item[0] = ice->gpio.saved[0]; | 453 | ucontrol->value.enumerated.item[0] = ice->gpio.saved[0]; |
@@ -455,9 +455,9 @@ static int cs_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontro | |||
455 | return 0; | 455 | return 0; |
456 | } | 456 | } |
457 | 457 | ||
458 | static int cs_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 458 | static int cs_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
459 | { | 459 | { |
460 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 460 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
461 | unsigned char val; | 461 | unsigned char val; |
462 | int change = 0; | 462 | int change = 0; |
463 | 463 | ||
@@ -476,7 +476,7 @@ static int cs_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontro | |||
476 | /* | 476 | /* |
477 | * GPIO controls | 477 | * GPIO controls |
478 | */ | 478 | */ |
479 | static int pontis_gpio_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 479 | static int pontis_gpio_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
480 | { | 480 | { |
481 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 481 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
482 | uinfo->count = 1; | 482 | uinfo->count = 1; |
@@ -485,9 +485,9 @@ static int pontis_gpio_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * | |||
485 | return 0; | 485 | return 0; |
486 | } | 486 | } |
487 | 487 | ||
488 | static int pontis_gpio_mask_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 488 | static int pontis_gpio_mask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
489 | { | 489 | { |
490 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 490 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
491 | down(&ice->gpio_mutex); | 491 | down(&ice->gpio_mutex); |
492 | /* 4-7 reserved */ | 492 | /* 4-7 reserved */ |
493 | ucontrol->value.integer.value[0] = (~ice->gpio.write_mask & 0xffff) | 0x00f0; | 493 | ucontrol->value.integer.value[0] = (~ice->gpio.write_mask & 0xffff) | 0x00f0; |
@@ -495,9 +495,9 @@ static int pontis_gpio_mask_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t | |||
495 | return 0; | 495 | return 0; |
496 | } | 496 | } |
497 | 497 | ||
498 | static int pontis_gpio_mask_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 498 | static int pontis_gpio_mask_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
499 | { | 499 | { |
500 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 500 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
501 | unsigned int val; | 501 | unsigned int val; |
502 | int changed; | 502 | int changed; |
503 | down(&ice->gpio_mutex); | 503 | down(&ice->gpio_mutex); |
@@ -509,9 +509,9 @@ static int pontis_gpio_mask_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t | |||
509 | return changed; | 509 | return changed; |
510 | } | 510 | } |
511 | 511 | ||
512 | static int pontis_gpio_dir_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 512 | static int pontis_gpio_dir_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
513 | { | 513 | { |
514 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 514 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
515 | down(&ice->gpio_mutex); | 515 | down(&ice->gpio_mutex); |
516 | /* 4-7 reserved */ | 516 | /* 4-7 reserved */ |
517 | ucontrol->value.integer.value[0] = ice->gpio.direction & 0xff0f; | 517 | ucontrol->value.integer.value[0] = ice->gpio.direction & 0xff0f; |
@@ -519,9 +519,9 @@ static int pontis_gpio_dir_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * | |||
519 | return 0; | 519 | return 0; |
520 | } | 520 | } |
521 | 521 | ||
522 | static int pontis_gpio_dir_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol) | 522 | static int pontis_gpio_dir_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
523 | { | 523 | { |
524 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 524 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
525 | unsigned int val; | 525 | unsigned int val; |
526 | int changed; | 526 | int changed; |
527 | down(&ice->gpio_mutex); | 527 | down(&ice->gpio_mutex); |
@@ -533,9 +533,9 @@ static int pontis_gpio_dir_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * | |||
533 | return changed; | 533 | return changed; |
534 | } | 534 | } |
535 | 535 | ||
536 | static int pontis_gpio_data_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 536 | static int pontis_gpio_data_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
537 | { | 537 | { |
538 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 538 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
539 | down(&ice->gpio_mutex); | 539 | down(&ice->gpio_mutex); |
540 | snd_ice1712_gpio_set_dir(ice, ice->gpio.direction); | 540 | snd_ice1712_gpio_set_dir(ice, ice->gpio.direction); |
541 | snd_ice1712_gpio_set_mask(ice, ice->gpio.write_mask); | 541 | snd_ice1712_gpio_set_mask(ice, ice->gpio.write_mask); |
@@ -544,9 +544,9 @@ static int pontis_gpio_data_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * | |||
544 | return 0; | 544 | return 0; |
545 | } | 545 | } |
546 | 546 | ||
547 | static int pontis_gpio_data_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 547 | static int pontis_gpio_data_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
548 | { | 548 | { |
549 | ice1712_t *ice = snd_kcontrol_chip(kcontrol); | 549 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
550 | unsigned int val, nval; | 550 | unsigned int val, nval; |
551 | int changed = 0; | 551 | int changed = 0; |
552 | down(&ice->gpio_mutex); | 552 | down(&ice->gpio_mutex); |
@@ -566,7 +566,7 @@ static int pontis_gpio_data_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * | |||
566 | * mixers | 566 | * mixers |
567 | */ | 567 | */ |
568 | 568 | ||
569 | static snd_kcontrol_new_t pontis_controls[] __devinitdata = { | 569 | static struct snd_kcontrol_new pontis_controls[] __devinitdata = { |
570 | { | 570 | { |
571 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 571 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
572 | .name = "PCM Playback Volume", | 572 | .name = "PCM Playback Volume", |
@@ -646,9 +646,9 @@ static snd_kcontrol_new_t pontis_controls[] __devinitdata = { | |||
646 | /* | 646 | /* |
647 | * WM codec registers | 647 | * WM codec registers |
648 | */ | 648 | */ |
649 | static void wm_proc_regs_write(snd_info_entry_t *entry, snd_info_buffer_t *buffer) | 649 | static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
650 | { | 650 | { |
651 | ice1712_t *ice = (ice1712_t *)entry->private_data; | 651 | struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data; |
652 | char line[64]; | 652 | char line[64]; |
653 | unsigned int reg, val; | 653 | unsigned int reg, val; |
654 | down(&ice->gpio_mutex); | 654 | down(&ice->gpio_mutex); |
@@ -661,9 +661,9 @@ static void wm_proc_regs_write(snd_info_entry_t *entry, snd_info_buffer_t *buffe | |||
661 | up(&ice->gpio_mutex); | 661 | up(&ice->gpio_mutex); |
662 | } | 662 | } |
663 | 663 | ||
664 | static void wm_proc_regs_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer) | 664 | static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
665 | { | 665 | { |
666 | ice1712_t *ice = (ice1712_t *)entry->private_data; | 666 | struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data; |
667 | int reg, val; | 667 | int reg, val; |
668 | 668 | ||
669 | down(&ice->gpio_mutex); | 669 | down(&ice->gpio_mutex); |
@@ -674,9 +674,9 @@ static void wm_proc_regs_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer | |||
674 | up(&ice->gpio_mutex); | 674 | up(&ice->gpio_mutex); |
675 | } | 675 | } |
676 | 676 | ||
677 | static void wm_proc_init(ice1712_t *ice) | 677 | static void wm_proc_init(struct snd_ice1712 *ice) |
678 | { | 678 | { |
679 | snd_info_entry_t *entry; | 679 | struct snd_info_entry *entry; |
680 | if (! snd_card_proc_new(ice->card, "wm_codec", &entry)) { | 680 | if (! snd_card_proc_new(ice->card, "wm_codec", &entry)) { |
681 | snd_info_set_text_ops(entry, ice, 1024, wm_proc_regs_read); | 681 | snd_info_set_text_ops(entry, ice, 1024, wm_proc_regs_read); |
682 | entry->mode |= S_IWUSR; | 682 | entry->mode |= S_IWUSR; |
@@ -685,9 +685,9 @@ static void wm_proc_init(ice1712_t *ice) | |||
685 | } | 685 | } |
686 | } | 686 | } |
687 | 687 | ||
688 | static void cs_proc_regs_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer) | 688 | static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
689 | { | 689 | { |
690 | ice1712_t *ice = (ice1712_t *)entry->private_data; | 690 | struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data; |
691 | int reg, val; | 691 | int reg, val; |
692 | 692 | ||
693 | down(&ice->gpio_mutex); | 693 | down(&ice->gpio_mutex); |
@@ -700,16 +700,16 @@ static void cs_proc_regs_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer | |||
700 | up(&ice->gpio_mutex); | 700 | up(&ice->gpio_mutex); |
701 | } | 701 | } |
702 | 702 | ||
703 | static void cs_proc_init(ice1712_t *ice) | 703 | static void cs_proc_init(struct snd_ice1712 *ice) |
704 | { | 704 | { |
705 | snd_info_entry_t *entry; | 705 | struct snd_info_entry *entry; |
706 | if (! snd_card_proc_new(ice->card, "cs_codec", &entry)) { | 706 | if (! snd_card_proc_new(ice->card, "cs_codec", &entry)) { |
707 | snd_info_set_text_ops(entry, ice, 1024, cs_proc_regs_read); | 707 | snd_info_set_text_ops(entry, ice, 1024, cs_proc_regs_read); |
708 | } | 708 | } |
709 | } | 709 | } |
710 | 710 | ||
711 | 711 | ||
712 | static int __devinit pontis_add_controls(ice1712_t *ice) | 712 | static int __devinit pontis_add_controls(struct snd_ice1712 *ice) |
713 | { | 713 | { |
714 | unsigned int i; | 714 | unsigned int i; |
715 | int err; | 715 | int err; |
@@ -730,7 +730,7 @@ static int __devinit pontis_add_controls(ice1712_t *ice) | |||
730 | /* | 730 | /* |
731 | * initialize the chip | 731 | * initialize the chip |
732 | */ | 732 | */ |
733 | static int __devinit pontis_init(ice1712_t *ice) | 733 | static int __devinit pontis_init(struct snd_ice1712 *ice) |
734 | { | 734 | { |
735 | static unsigned short wm_inits[] = { | 735 | static unsigned short wm_inits[] = { |
736 | /* These come first to reduce init pop noise */ | 736 | /* These come first to reduce init pop noise */ |
@@ -781,7 +781,7 @@ static int __devinit pontis_init(ice1712_t *ice) | |||
781 | ice->num_total_adcs = 2; | 781 | ice->num_total_adcs = 2; |
782 | 782 | ||
783 | /* to remeber the register values */ | 783 | /* to remeber the register values */ |
784 | ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); | 784 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); |
785 | if (! ice->akm) | 785 | if (! ice->akm) |
786 | return -ENOMEM; | 786 | return -ENOMEM; |
787 | ice->akm_codecs = 1; | 787 | ice->akm_codecs = 1; |