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

[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

sound/pci/ice1712/amp.c

+3 −3
Original line number Diff line number Diff line
@@ -33,14 +33,14 @@ 
#include "envy24ht.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;

	cval = (reg << 9) | val;

	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[] = {

		WM_ATTEN_L,	0x0000,	/* 0 db */
@@ -66,7 +66,7 @@ static int __devinit snd_vt1724_amp_init(ice1712_t *ice) 
	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 */

	snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);

sound/pci/ice1712/aureon.c

+121 −121

File changed.

Preview size limit exceeded, changes collapsed.

sound/pci/ice1712/envy24ht.h

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ enum { 
#define VT1724_MT_PDMA1_COUNT		0x76	/* word */





unsigned char snd_vt1724_read_i2c(ice1712_t *ice, unsigned char dev, unsigned char addr);

void snd_vt1724_write_i2c(ice1712_t *ice, unsigned char dev, unsigned char addr, unsigned char data);

unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice, unsigned char dev, unsigned char addr);

void snd_vt1724_write_i2c(struct snd_ice1712 *ice, unsigned char dev, unsigned char addr, unsigned char data);



#endif /* __SOUND_VT1724_H */

sound/pci/ice1712/ice1724.c

+308 −224

File changed.

Preview size limit exceeded, changes collapsed.

sound/pci/ice1712/juli.c

+12 −12
Original line number Diff line number Diff line
@@ -65,30 +65,30 @@ 


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)

{

	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

 */



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)

{

	ice1712_t *ice = ak->private_data[0];

	struct snd_ice1712 *ice = ak->private_data[0];

	 

	snd_assert(chip == 0, return);

	snd_vt1724_write_i2c(ice, AK4358_ADDR, addr, data);
@@ -97,7 +97,7 @@ static void juli_akm_write(akm4xxx_t *ak, int chip, 
/*

 * 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;
@@ -125,7 +125,7 @@ static void juli_akm_set_rate_val(akm4xxx_t *ak, unsigned int rate) 
	snd_akm4xxx_reset(ak, 0);

}



static akm4xxx_t akm_juli_dac __devinitdata = {

static struct snd_akm4xxx akm_juli_dac __devinitdata = {

	.type = SND_AK4358,

	.num_dacs = 2,

	.ops = {
@@ -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);

}
@@ -144,7 +144,7 @@ static int __devinit juli_add_controls(ice1712_t *ice) 
/*

 * 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[] = {

		/* AK4117_REG_PWRDN */	AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1,
@@ -158,7 +158,7 @@ static int __devinit juli_init(ice1712_t *ice) 
		0x41, 0x02, 0x2c, 0x00, 0x00

	};

	int err;

	akm4xxx_t *ak;

	struct snd_akm4xxx *ak;



#if 0

	for (err = 0; err < 0x20; err++)
@@ -189,7 +189,7 @@ static int __devinit juli_init(ice1712_t *ice) 
		ice->num_total_dacs = 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)

			return -ENOMEM;

		ice->akm_codecs = 1;