Skip to content

L
linux
Commit ab0c7d72 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: PCI ICE1724 

Modules: ICE1724 driver,ICE1712 driver

Remove xxx_t typedefs from the PCI ICE1724 driver.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6ca308d4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 617 additions and 533 deletions
sound/pci/ice1712/amp.c
View file @ ab0c7d72
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
#include "envy24ht.h" #include "envy24ht.h"
#include "amp.h" #include "amp.h"
static void wm_put(ice1712_t *ice, int reg, unsigned short val) static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val)
{ {
unsigned short cval; unsigned short cval;
cval = (reg << 9) | val; cval = (reg << 9) | val;
snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff); snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff);
} }
static int __devinit snd_vt1724_amp_init(ice1712_t *ice) static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
{ {
static unsigned short wm_inits[] = { static unsigned short wm_inits[] = {
WM_ATTEN_L, 0x0000, /* 0 db */ WM_ATTEN_L, 0x0000, /* 0 db */
...@@ -66,7 +66,7 @@ static int __devinit snd_vt1724_amp_init(ice1712_t *ice) ...@@ -66,7 +66,7 @@ static int __devinit snd_vt1724_amp_init(ice1712_t *ice)
return 0; return 0;
} }
static int __devinit snd_vt1724_amp_add_controls(ice1712_t *ice) static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
{ {
/* we use pins 39 and 41 of the VT1616 for left and right read outputs */ /* we use pins 39 and 41 of the VT1616 for left and right read outputs */
snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000); snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
......
sound/pci/ice1712/aureon.c
View file @ ab0c7d72
This diff is collapsed.
sound/pci/ice1712/envy24ht.h
View file @ ab0c7d72
...@@ -209,7 +209,7 @@ enum { ...@@ -209,7 +209,7 @@ enum {
#define VT1724_MT_PDMA1_COUNT 0x76 /* word */ #define VT1724_MT_PDMA1_COUNT 0x76 /* word */
unsigned char snd_vt1724_read_i2c(ice1712_t *ice, unsigned char dev, unsigned char addr); unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice, unsigned char dev, unsigned char addr);
void snd_vt1724_write_i2c(ice1712_t *ice, unsigned char dev, unsigned char addr, unsigned char data); void snd_vt1724_write_i2c(struct snd_ice1712 *ice, unsigned char dev, unsigned char addr, unsigned char data);
#endif /* __SOUND_VT1724_H */ #endif /* __SOUND_VT1724_H */
sound/pci/ice1712/ice1724.c
View file @ ab0c7d72
This diff is collapsed.
sound/pci/ice1712/juli.c
View file @ ab0c7d72
...@@ -65,30 +65,30 @@ ...@@ -65,30 +65,30 @@
static void juli_ak4114_write(void *private_data, unsigned char reg, unsigned char val) static void juli_ak4114_write(void *private_data, unsigned char reg, unsigned char val)
{ {
snd_vt1724_write_i2c((ice1712_t *)private_data, AK4114_ADDR, reg, val); snd_vt1724_write_i2c((struct snd_ice1712 *)private_data, AK4114_ADDR, reg, val);
} }
static unsigned char juli_ak4114_read(void *private_data, unsigned char reg) static unsigned char juli_ak4114_read(void *private_data, unsigned char reg)
{ {
return snd_vt1724_read_i2c((ice1712_t *)private_data, AK4114_ADDR, reg); return snd_vt1724_read_i2c((struct snd_ice1712 *)private_data, AK4114_ADDR, reg);
} }
/* /*
* AK4358 section * AK4358 section
*/ */
static void juli_akm_lock(akm4xxx_t *ak, int chip) static void juli_akm_lock(struct snd_akm4xxx *ak, int chip)
{ {
} }
static void juli_akm_unlock(akm4xxx_t *ak, int chip) static void juli_akm_unlock(struct snd_akm4xxx *ak, int chip)
{ {
} }
static void juli_akm_write(akm4xxx_t *ak, int chip, static void juli_akm_write(struct snd_akm4xxx *ak, int chip,
unsigned char addr, unsigned char data) unsigned char addr, unsigned char data)
{ {
ice1712_t *ice = ak->private_data[0]; struct snd_ice1712 *ice = ak->private_data[0];
snd_assert(chip == 0, return); snd_assert(chip == 0, return);
snd_vt1724_write_i2c(ice, AK4358_ADDR, addr, data); snd_vt1724_write_i2c(ice, AK4358_ADDR, addr, data);
...@@ -97,7 +97,7 @@ static void juli_akm_write(akm4xxx_t *ak, int chip, ...@@ -97,7 +97,7 @@ static void juli_akm_write(akm4xxx_t *ak, int chip,
/* /*
* change the rate of envy24HT, AK4358 * change the rate of envy24HT, AK4358
*/ */
static void juli_akm_set_rate_val(akm4xxx_t *ak, unsigned int rate) static void juli_akm_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)
{ {
unsigned char old, tmp, dfs; unsigned char old, tmp, dfs;
...@@ -125,7 +125,7 @@ static void juli_akm_set_rate_val(akm4xxx_t *ak, unsigned int rate) ...@@ -125,7 +125,7 @@ static void juli_akm_set_rate_val(akm4xxx_t *ak, unsigned int rate)
snd_akm4xxx_reset(ak, 0); snd_akm4xxx_reset(ak, 0);
} }
static akm4xxx_t akm_juli_dac __devinitdata = { static struct snd_akm4xxx akm_juli_dac __devinitdata = {
.type = SND_AK4358, .type = SND_AK4358,
.num_dacs = 2, .num_dacs = 2,
.ops = { .ops = {
...@@ -136,7 +136,7 @@ static akm4xxx_t akm_juli_dac __devinitdata = { ...@@ -136,7 +136,7 @@ static akm4xxx_t akm_juli_dac __devinitdata = {
} }
}; };
static int __devinit juli_add_controls(ice1712_t *ice) static int __devinit juli_add_controls(struct snd_ice1712 *ice)
{ {
return snd_ice1712_akm4xxx_build_controls(ice); return snd_ice1712_akm4xxx_build_controls(ice);
} }
...@@ -144,7 +144,7 @@ static int __devinit juli_add_controls(ice1712_t *ice) ...@@ -144,7 +144,7 @@ static int __devinit juli_add_controls(ice1712_t *ice)
/* /*
* initialize the chip * initialize the chip
*/ */
static int __devinit juli_init(ice1712_t *ice) static int __devinit juli_init(struct snd_ice1712 *ice)
{ {
static unsigned char ak4114_init_vals[] = { static unsigned char ak4114_init_vals[] = {
/* AK4117_REG_PWRDN */ AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, /* AK4117_REG_PWRDN */ AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1,
...@@ -158,7 +158,7 @@ static int __devinit juli_init(ice1712_t *ice) ...@@ -158,7 +158,7 @@ static int __devinit juli_init(ice1712_t *ice)
0x41, 0x02, 0x2c, 0x00, 0x00 0x41, 0x02, 0x2c, 0x00, 0x00
}; };
int err; int err;
akm4xxx_t *ak; struct snd_akm4xxx *ak;
#if 0 #if 0
for (err = 0; err < 0x20; err++) for (err = 0; err < 0x20; err++)
...@@ -189,7 +189,7 @@ static int __devinit juli_init(ice1712_t *ice) ...@@ -189,7 +189,7 @@ static int __devinit juli_init(ice1712_t *ice)
ice->num_total_dacs = 2; ice->num_total_dacs = 2;
ice->num_total_adcs = 2; ice->num_total_adcs = 2;
ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); ak = ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
if (! ak) if (! ak)
return -ENOMEM; return -ENOMEM;
ice->akm_codecs = 1; ice->akm_codecs = 1;
......
sound/pci/ice1712/phase.c
View file @ ab0c7d72
This diff is collapsed.
sound/pci/ice1712/pontis.c
View file @ ab0c7d72
This diff is collapsed.
sound/pci/ice1712/prodigy192.c
View file @ ab0c7d72
This diff is collapsed.
sound/pci/ice1712/revo.c
View file @ ab0c7d72
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "envy24ht.h" #include "envy24ht.h"
#include "revo.h" #include "revo.h"
static void revo_i2s_mclk_changed(ice1712_t *ice) static void revo_i2s_mclk_changed(struct snd_ice1712 *ice)
{ {
/* assert PRST# to converters; MT05 bit 7 */ /* assert PRST# to converters; MT05 bit 7 */
outb(inb(ICEMT1724(ice, AC97_CMD)) | 0x80, ICEMT1724(ice, AC97_CMD)); outb(inb(ICEMT1724(ice, AC97_CMD)) | 0x80, ICEMT1724(ice, AC97_CMD));
...@@ -45,7 +45,7 @@ static void revo_i2s_mclk_changed(ice1712_t *ice) ...@@ -45,7 +45,7 @@ static void revo_i2s_mclk_changed(ice1712_t *ice)
/* /*
* change the rate of envy24HT, AK4355 and AK4381 * change the rate of envy24HT, AK4355 and AK4381
*/ */
static void revo_set_rate_val(akm4xxx_t *ak, unsigned int rate) static void revo_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)
{ {
unsigned char old, tmp, dfs; unsigned char old, tmp, dfs;
int reg, shift; int reg, shift;
...@@ -87,7 +87,7 @@ static void revo_set_rate_val(akm4xxx_t *ak, unsigned int rate) ...@@ -87,7 +87,7 @@ static void revo_set_rate_val(akm4xxx_t *ak, unsigned int rate)
* initialize the chips on M-Audio Revolution cards * initialize the chips on M-Audio Revolution cards
*/ */
static akm4xxx_t akm_revo_front __devinitdata = { static struct snd_akm4xxx akm_revo_front __devinitdata = {
.type = SND_AK4381, .type = SND_AK4381,
.num_dacs = 2, .num_dacs = 2,
.ops = { .ops = {
...@@ -107,7 +107,7 @@ static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = { ...@@ -107,7 +107,7 @@ static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static akm4xxx_t akm_revo_surround __devinitdata = { static struct snd_akm4xxx akm_revo_surround __devinitdata = {
.type = SND_AK4355, .type = SND_AK4355,
.idx_offset = 1, .idx_offset = 1,
.num_dacs = 6, .num_dacs = 6,
...@@ -128,9 +128,9 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = { ...@@ -128,9 +128,9 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static int __devinit revo_init(ice1712_t *ice) static int __devinit revo_init(struct snd_ice1712 *ice)
{ {
akm4xxx_t *ak; struct snd_akm4xxx *ak;
int err; int err;
/* determine I2C, DACs and ADCs */ /* determine I2C, DACs and ADCs */
...@@ -147,7 +147,7 @@ static int __devinit revo_init(ice1712_t *ice) ...@@ -147,7 +147,7 @@ static int __devinit revo_init(ice1712_t *ice)
ice->gpio.i2s_mclk_changed = revo_i2s_mclk_changed; ice->gpio.i2s_mclk_changed = revo_i2s_mclk_changed;
/* second stage of initialization, analog parts and others */ /* second stage of initialization, analog parts and others */
ak = ice->akm = kcalloc(2, sizeof(akm4xxx_t), GFP_KERNEL); ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
if (! ak) if (! ak)
return -ENOMEM; return -ENOMEM;
ice->akm_codecs = 2; ice->akm_codecs = 2;
...@@ -166,7 +166,7 @@ static int __devinit revo_init(ice1712_t *ice) ...@@ -166,7 +166,7 @@ static int __devinit revo_init(ice1712_t *ice)
} }
static int __devinit revo_add_controls(ice1712_t *ice) static int __devinit revo_add_controls(struct snd_ice1712 *ice)
{ {
int err; int err;
......
sound/pci/ice1712/vt1720_mobo.c
View file @ ab0c7d72
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "vt1720_mobo.h" #include "vt1720_mobo.h"
static int __devinit k8x800_init(ice1712_t *ice) static int __devinit k8x800_init(struct snd_ice1712 *ice)
{ {
ice->vt1720 = 1; ice->vt1720 = 1;
...@@ -47,7 +47,7 @@ static int __devinit k8x800_init(ice1712_t *ice) ...@@ -47,7 +47,7 @@ static int __devinit k8x800_init(ice1712_t *ice)
return 0; return 0;
} }
static int __devinit k8x800_add_controls(ice1712_t *ice) static int __devinit k8x800_add_controls(struct snd_ice1712 *ice)
{ {
/* FIXME: needs some quirks for VT1616? */ /* FIXME: needs some quirks for VT1616? */
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7