Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ce211a9 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Jaroslav Kysela
Browse files

ALSA: ice1712/aureon.c: fix coding style 



before:
total: 304 errors, 137 warnings, 2259 lines checked

after:
total: 0 errors, 121 warnings, 2284 lines checked

Compile tested, size is different because of include was changed,
but without that change md5sum is different because of cmp cx,dx/cmp
dx,cx swap and __LINE__ was changed in printk function.

Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 59fcbb63

sound/pci/ice1712/aureon.c

+351 −326
Original line number Diff line number Diff line
@@ -44,10 +44,9 @@ 
 *       not working: prety much everything else, at least i could verify that

 *                    we have no digital output, no capture, pretty bad clicks and poops

 *                    on mixer switch and other coll stuff.

 *

 */



#include <asm/io.h>

#include <linux/io.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/init.h>
@@ -153,9 +152,15 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg, 
	 */

	for (j = 0; j < 3; j++) {

		switch (j) {

		case 0: val = dev; break;

		case 1: val = reg; break;

		case 2: val = data; break;

		case 0:

			val = dev;

			break;

		case 1:

			val = reg;

			break;

		case 2:

			val = data;

			break;

		}

		for (i = 7; i >= 0; i--) {

			tmp &= ~AUREON_SPI_CLK;
@@ -231,12 +236,12 @@ static int aureon_universe_inmux_put(struct snd_kcontrol *kcontrol, 
		return -EINVAL;

	snd_ice1712_save_gpio_status(ice);

	oval = spec->pca9554_out;

	if ((change = (oval != nval))) {

	change = (oval != nval);

	if (change) {

		aureon_pca9554_write(ice, PCA9554_OUT, nval);

		spec->pca9554_out = nval;

	}

	snd_ice1712_restore_gpio_status(ice);

	

	return change;

}
@@ -348,7 +353,8 @@ static int aureon_ac97_init (struct snd_ice1712 *ice) 
	for (i = 0; ac97_defaults[i] != (unsigned short)-1; i += 2)

		spec->stac9744[(ac97_defaults[i]) >> 1] = ac97_defaults[i+1];



	aureon_ac97_write(ice, AC97_MASTER, 0x0000); // Unmute AC'97 master volume permanently - muting is done by WM8770

	/* Unmute AC'97 master volume permanently - muting is done by WM8770 */

	aureon_ac97_write(ice, AC97_MASTER, 0x0000);



	return 0;

}
@@ -397,7 +403,8 @@ static int aureon_ac97_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ele 
		nvol |= ((0x1F - ucontrol->value.integer.value[1]) << 8) & 0x1F00;

	nvol |= ovol & ~0x1F1F;



	if ((change = (ovol != nvol)))

	change = (ovol != nvol);

	if (change)

		aureon_ac97_write(ice, kcontrol->private_value & 0x7F, nvol);



	snd_ice1712_restore_gpio_status(ice);
@@ -416,7 +423,8 @@ static int aureon_ac97_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_el 


	mutex_lock(&ice->gpio_mutex);



	ucontrol->value.integer.value[0] = aureon_ac97_read(ice, kcontrol->private_value & 0x7F) & 0x8000 ? 0 : 1;

	ucontrol->value.integer.value[0] = aureon_ac97_read(ice,

			kcontrol->private_value & 0x7F) & 0x8000 ? 0 : 1;



	mutex_unlock(&ice->gpio_mutex);

	return 0;
@@ -433,7 +441,8 @@ static int aureon_ac97_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el 
	ovol = aureon_ac97_read(ice, kcontrol->private_value & 0x7F);

	nvol = (ucontrol->value.integer.value[0] ? 0x0000 : 0x8000) | (ovol & ~0x8000);



	if ((change = (ovol != nvol)))

	change = (ovol != nvol);

	if (change)

		aureon_ac97_write(ice, kcontrol->private_value & 0x7F, nvol);



	snd_ice1712_restore_gpio_status(ice);
@@ -469,7 +478,8 @@ static int aureon_ac97_micboost_put(struct snd_kcontrol *kcontrol, struct snd_ct 
	ovol = aureon_ac97_read(ice, AC97_MIC);

	nvol = (ucontrol->value.integer.value[0] ? 0x0000 : 0x0020) | (ovol & ~0x0020);



	if ((change = (ovol != nvol)))

	change = (ovol != nvol);

	if (change)

		aureon_ac97_write(ice, AC97_MIC, nvol);



	snd_ice1712_restore_gpio_status(ice);
@@ -493,8 +503,7 @@ static void aureon_spi_write(struct snd_ice1712 *ice, unsigned int cs, unsigned 
		snd_ice1712_gpio_set_mask(ice, ~(PRODIGY_SPI_MOSI|PRODIGY_SPI_CLK|PRODIGY_WM_CS));

		mosi = PRODIGY_SPI_MOSI;

		clk = PRODIGY_SPI_CLK;

	}

	else {

	} else {

		snd_ice1712_gpio_set_mask(ice, ~(AUREON_WM_RW|AUREON_SPI_MOSI|AUREON_SPI_CLK|

						 AUREON_WM_CS|AUREON_CS8415_CS));

		mosi = AUREON_SPI_MOSI;
@@ -534,7 +543,9 @@ static void aureon_spi_write(struct snd_ice1712 *ice, unsigned int cs, unsigned 
/*

 * Read data in SPI mode

 */

static void aureon_spi_read(struct snd_ice1712 *ice, unsigned int cs, unsigned int data, int bits, unsigned char *buffer, int size) {

static void aureon_spi_read(struct snd_ice1712 *ice, unsigned int cs,

		unsigned int data, int bits, unsigned char *buffer, int size)

{

	int i, j;

	unsigned int tmp;
@@ -584,19 +595,24 @@ static void aureon_spi_read(struct snd_ice1712 *ice, unsigned int cs, unsigned i 
	snd_ice1712_gpio_write(ice, tmp);

}



static unsigned char aureon_cs8415_get(struct snd_ice1712 *ice, int reg) {

static unsigned char aureon_cs8415_get(struct snd_ice1712 *ice, int reg)

{

	unsigned char val;

	aureon_spi_write(ice, AUREON_CS8415_CS, 0x2000 | reg, 16);

	aureon_spi_read(ice, AUREON_CS8415_CS, 0x21, 8, &val, 1);

	return val;

}



static void aureon_cs8415_read(struct snd_ice1712 *ice, int reg, unsigned char *buffer, int size) {

static void aureon_cs8415_read(struct snd_ice1712 *ice, int reg,

				unsigned char *buffer, int size)

{

	aureon_spi_write(ice, AUREON_CS8415_CS, 0x2000 | reg, 16);

	aureon_spi_read(ice, AUREON_CS8415_CS, 0x21, 8, buffer, size);

}



static void aureon_cs8415_put(struct snd_ice1712 *ice, int reg, unsigned char val) {

static void aureon_cs8415_put(struct snd_ice1712 *ice, int reg,

						unsigned char val)

{

	aureon_spi_write(ice, AUREON_CS8415_CS, 0x200000 | (reg << 8) | val, 24);

}
@@ -654,7 +670,8 @@ static int aureon_ac97_mmute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e 
	return 0;

}



static int aureon_ac97_mmute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {

static int aureon_ac97_mmute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);

	unsigned short ovol, nvol;

	int change;
@@ -663,7 +680,8 @@ static int aureon_ac97_mmute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e 


	ovol = wm_get(ice, WM_OUT_MUX1);

	nvol = (ovol & ~0x02) | (ucontrol->value.integer.value[0] ? 0x02 : 0x00);

	if ((change = (ovol != nvol)))

	change = (ovol != nvol);

	if (change)

		wm_put(ice, WM_OUT_MUX1, nvol);



	snd_ice1712_restore_gpio_status(ice);
@@ -736,7 +754,8 @@ static int wm_pcm_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va 
	snd_ice1712_save_gpio_status(ice);

	oval = wm_get(ice, WM_MUTE);

	nval = (oval & ~0x10) | (ucontrol->value.integer.value[0] ? 0 : 0x10);

	if ((change = (nval != oval)))

	change = (oval != nval);

	if (change)

		wm_put(ice, WM_MUTE, nval);

	snd_ice1712_restore_gpio_status(ice);
@@ -849,7 +868,8 @@ static int wm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value * 
/*

 * WM8770 mute control

 */

static int wm_mute_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) {

static int wm_mute_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = kcontrol->private_value >> 8;

	uinfo->value.integer.min = 0;
@@ -1083,21 +1103,21 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val 
static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	static const char * const texts[] = {

		"CD",		//AIN1

		"Aux",		//AIN2

		"Line",		//AIN3

		"Mic",		//AIN4

		"AC97"		//AIN5

		"CD",		/* AIN1 */

		"Aux",		/* AIN2 */

		"Line",		/* AIN3 */

		"Mic",		/* AIN4 */

		"AC97"		/* AIN5 */

	};

	static const char * const universe_texts[] = {

		"Aux1",		//AIN1

		"CD",		//AIN2

		"Phono",	//AIN3

		"Line",		//AIN4

		"Aux2",		//AIN5

		"Mic",		//AIN6

		"Aux3",		//AIN7

		"AC97"		//AIN8

		"Aux1",		/* AIN1 */

		"CD",		/* AIN2 */

		"Phono",	/* AIN3 */

		"Line",		/* AIN4 */

		"Aux2",		/* AIN5 */

		"Mic",		/* AIN6 */

		"Aux3",		/* AIN7 */

		"AC97"		/* AIN8 */

	};

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
@@ -1108,8 +1128,7 @@ static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_in 
		if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

			uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

		strcpy(uinfo->value.enumerated.name, universe_texts[uinfo->value.enumerated.item]);

	}

	else {

	} else {

		uinfo->value.enumerated.items = 5;

		if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

			uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
@@ -1156,8 +1175,8 @@ static int aureon_cs8415_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_ 
{

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);

	static const char * const aureon_texts[] = {

		"CD",		//RXP0

		"Optical"	//RXP1

		"CD",		/* RXP0 */

		"Optical"	/* RXP1 */

	};

	static const char * const prodigy_texts[] = {

		"CD",
@@ -1180,10 +1199,10 @@ static int aureon_cs8415_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e 
	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);

	struct aureon_spec *spec = ice->spec;



	//snd_ice1712_save_gpio_status(ice);

	//val = aureon_cs8415_get(ice, CS8415_CTRL2);

	/* snd_ice1712_save_gpio_status(ice); */

	/* val = aureon_cs8415_get(ice, CS8415_CTRL2); */

	ucontrol->value.enumerated.item[0] = spec->cs8415_mux;

	//snd_ice1712_restore_gpio_status(ice);

	/* snd_ice1712_restore_gpio_status(ice); */

	return 0;

}
@@ -1249,7 +1268,8 @@ static int aureon_cs8415_mute_put (struct snd_kcontrol *kcontrol, struct snd_ctl 
		nval = oval & ~0x20;

	else

		nval = oval | 0x20;

	if ((change = (oval != nval)))

	change = (oval != nval);

	if (change)

		aureon_cs8415_put(ice, CS8415_CTRL1, nval);

	snd_ice1712_restore_gpio_status(ice);

	return change;
@@ -1258,13 +1278,15 @@ static int aureon_cs8415_mute_put (struct snd_kcontrol *kcontrol, struct snd_ctl 
/*

 * CS8415A Q-Sub info

 */

static int aureon_cs8415_qsub_info (struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) {

static int aureon_cs8415_qsub_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;

	uinfo->count = 10;

	return 0;

}



static int aureon_cs8415_qsub_get (struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {

static int aureon_cs8415_qsub_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);



	snd_ice1712_save_gpio_status(ice);
@@ -1274,18 +1296,21 @@ static int aureon_cs8415_qsub_get (struct snd_kcontrol *kcontrol, struct snd_ctl 
	return 0;

}



static int aureon_cs8415_spdif_info (struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) {

static int aureon_cs8415_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;

	uinfo->count = 1;

	return 0;

}



static int aureon_cs8415_mask_get (struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {

static int aureon_cs8415_mask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	memset(ucontrol->value.iec958.status, 0xFF, 24);

	return 0;

}



static int aureon_cs8415_spdif_get (struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {

static int aureon_cs8415_spdif_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);



	snd_ice1712_save_gpio_status(ice);
@@ -1912,8 +1937,7 @@ static int __devinit aureon_add_controls(struct snd_ice1712 *ice) 
			if (err < 0)

				return err;

		}

	}

	else if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT &&

	} else if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT &&

		 ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71XT) {

		for (i = 0; i < ARRAY_SIZE(ac97_controls); i++) {

			err = snd_ctl_add(ice->card, snd_ctl_new1(&ac97_controls[i], ice));
@@ -2063,7 +2087,8 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) 
		return -ENOMEM;

	ice->akm_codecs = 1;



	if ((err = aureon_ac97_init(ice)) != 0)

	err = aureon_ac97_init(ice);

	if (err != 0)

		return err;



	snd_ice1712_gpio_set_dir(ice, 0x5fffff); /* fix this for the time being */