ALSA: emu10k1: fix coding style for emu10k1_main.c (67679b1f) · Commits · e / devices / android_kernel_xiaomi_markw

sound/pci/emu10k1/emu10k1_main.c

+182 −165

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ static unsigned int i2c_adc_init[][2] = {
	{ 0x12, 0x32 }, /* ALC Control 3 */		{ 0x12, 0x32 }, /* ALC Control 3 */
	{ 0x13, 0x00 }, /* Noise gate control */		{ 0x13, 0x00 }, /* Noise gate control */
	{ 0x14, 0xa6 }, /* Limiter control */		{ 0x14, 0xa6 }, /* Limiter control */
	{ 0x15, ADC_MUX_2 }, /* ADC Mixer control. Mic for Audigy 2 ZS Notebook */		{ 0x15, ADC_MUX_2 }, /* ADC Mixer control. Mic for A2ZS Notebook */
	};		};

	static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)		static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
	@@ -161,8 +161,8 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
	u32 tmp;		u32 tmp;

	/* disable audio and lock cache */		/* disable audio and lock cache */
	outl(HCFG_LOCKSOUNDCACHE \| HCFG_LOCKTANKCACHE_MASK \| HCFG_MUTEBUTTONENABLE,		outl(HCFG_LOCKSOUNDCACHE \| HCFG_LOCKTANKCACHE_MASK \|
	emu->port + HCFG);		HCFG_MUTEBUTTONENABLE, emu->port + HCFG);

	/* reset recording buffers */		/* reset recording buffers */
	snd_emu10k1_ptr_write(emu, MICBS, 0, ADCBS_BUFSIZE_NONE);		snd_emu10k1_ptr_write(emu, MICBS, 0, ADCBS_BUFSIZE_NONE);
	@@ -197,7 +197,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)

	if (emu->card_capabilities->ca0151_chip) { /* audigy2 */		if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
	/* Hacks for Alice3 to work independent of haP16V driver */		/* Hacks for Alice3 to work independent of haP16V driver */
	//Setup SRCMulti_I2S SamplingRate		/* Setup SRCMulti_I2S SamplingRate */
	tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);		tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
	tmp &= 0xfffff1ff;		tmp &= 0xfffff1ff;
	tmp \|= (0x2<<9);		tmp \|= (0x2<<9);
	@@ -217,7 +217,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
	if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */		if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
	/* Hacks for Alice3 to work independent of haP16V driver */		/* Hacks for Alice3 to work independent of haP16V driver */
	snd_printk(KERN_INFO "Audigy2 value: Special config.\n");		snd_printk(KERN_INFO "Audigy2 value: Special config.\n");
	//Setup SRCMulti_I2S SamplingRate		/* Setup SRCMulti_I2S SamplingRate */
	tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);		tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
	tmp &= 0xfffff1ff;		tmp &= 0xfffff1ff;
	tmp \|= (0x2<<9);		tmp \|= (0x2<<9);
	@@ -313,7 +313,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
	(emu->model == 0x21 && emu->revision < 6))		(emu->model == 0x21 && emu->revision < 6))
	outl(HCFG_LOCKTANKCACHE_MASK \| HCFG_AUTOMUTE, emu->port + HCFG);		outl(HCFG_LOCKTANKCACHE_MASK \| HCFG_AUTOMUTE, emu->port + HCFG);
	else		else
	// With on-chip joystick		/* With on-chip joystick */
	outl(HCFG_LOCKTANKCACHE_MASK \| HCFG_AUTOMUTE \| HCFG_JOYENABLE, emu->port + HCFG);		outl(HCFG_LOCKTANKCACHE_MASK \| HCFG_AUTOMUTE \| HCFG_JOYENABLE, emu->port + HCFG);

	if (enable_ir) { /* enable IR for SB Live */		if (enable_ir) { /* enable IR for SB Live */
	@@ -383,7 +383,7 @@ static void snd_emu10k1_audio_enable(struct snd_emu10k1 *emu)
	{		{
	unsigned int tmp;		unsigned int tmp;
	/* FIXME: the following routine disables LiveDrive-II !! */		/* FIXME: the following routine disables LiveDrive-II !! */
	// TOSLink detection		/* TOSLink detection */
	emu->tos_link = 0;		emu->tos_link = 0;
	tmp = inl(emu->port + HCFG);		tmp = inl(emu->port + HCFG);
	if (tmp & (HCFG_GPINPUT0 \| HCFG_GPINPUT1)) {		if (tmp & (HCFG_GPINPUT0 \| HCFG_GPINPUT1)) {
	@@ -666,7 +666,8 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 * emu, const char * file
	unsigned long flags;		unsigned long flags;
	const struct firmware *fw_entry;		const struct firmware *fw_entry;

	if ((err = request_firmware(&fw_entry, filename, &emu->pci->dev)) != 0) {		err = request_firmware(&fw_entry, filename, &emu->pci->dev);
			if (err != 0) {
	snd_printk(KERN_ERR "firmware: %s not found. Err = %d\n", filename, err);		snd_printk(KERN_ERR "firmware: %s not found. Err = %d\n", filename, err);
	return err;		return err;
	}		}
	@@ -728,20 +729,20 @@ static int emu1010_firmware_thread(void *data)
	snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK);		snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK);
	if (emu->card_capabilities->emu_model ==		if (emu->card_capabilities->emu_model ==
	EMU_MODEL_EMU1010) {		EMU_MODEL_EMU1010) {
	if ((err = snd_emu1010_load_firmware(emu, DOCK_FILENAME)) != 0) {		err = snd_emu1010_load_firmware(emu, DOCK_FILENAME);
			if (err != 0)
	continue;		continue;
	}
	} else if (emu->card_capabilities->emu_model ==		} else if (emu->card_capabilities->emu_model ==
	EMU_MODEL_EMU1010B) {		EMU_MODEL_EMU1010B) {
	if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {		err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME);
			if (err != 0)
	continue;		continue;
	}
	} else if (emu->card_capabilities->emu_model ==		} else if (emu->card_capabilities->emu_model ==
	EMU_MODEL_EMU1616) {		EMU_MODEL_EMU1616) {
	if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {		err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME);
			if (err != 0)
	continue;		continue;
	}		}
	}

	snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);		snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);
	snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg);		snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg);
	@@ -886,7 +887,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
	snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");		snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
	snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);		snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
	snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);		snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
	snd_printk("Hana ver:%d.%d\n",tmp ,tmp2);		snd_printk("emu1010: Hana version: %d.%d\n", tmp, tmp2);
	/* Enable 48Volt power to Audio Dock */		/* Enable 48Volt power to Audio Dock */
	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);		snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);

	@@ -926,7 +927,8 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);		snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);
	/* Unknown. */		/* Unknown. */
	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);		snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);
	/* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); // IRQ Enable: All on */		/* IRQ Enable: Alll on */
			/* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */
	/* IRQ Enable: All off */		/* IRQ Enable: All off */
	snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);		snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);

	@@ -936,7 +938,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);		snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);
	/* Word Clock source, Internal 48kHz x1 */		/* Word Clock source, Internal 48kHz x1 */
	snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);		snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);
	//snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K \| EMU_HANA_WCLOCK_4X );		/* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K \| EMU_HANA_WCLOCK_4X); */
	/* Audio Dock LEDs. */		/* Audio Dock LEDs. */
	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);		snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);

	@@ -1065,7 +1067,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
	EMU_DST_ALICE_I2S2_LEFT, EMU_SRC_DOCK_ADC3_LEFT1);		EMU_DST_ALICE_I2S2_LEFT, EMU_SRC_DOCK_ADC3_LEFT1);
	snd_emu1010_fpga_link_dst_src_write(emu,		snd_emu1010_fpga_link_dst_src_write(emu,
	EMU_DST_ALICE_I2S2_RIGHT, EMU_SRC_DOCK_ADC3_RIGHT1);		EMU_DST_ALICE_I2S2_RIGHT, EMU_SRC_DOCK_ADC3_RIGHT1);
	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01 ); // Unmute all		snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01); /* Unmute all */

	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp);		snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp);

	@@ -1218,20 +1220,20 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
	emu->emu1010.output_source[23] = 28;		emu->emu1010.output_source[23] = 28;
	}		}
	/* TEMP: Select SPDIF in/out */		/* TEMP: Select SPDIF in/out */
	//snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); /* Output spdif */		/* snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); / / Output spdif */

	/* TEMP: Select 48kHz SPDIF out */		/* TEMP: Select 48kHz SPDIF out */
	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */		snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */
	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x0); /* Default fallback clock 48kHz */		snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x0); /* Default fallback clock 48kHz */
	/* Word Clock source, Internal 48kHz x1 */		/* Word Clock source, Internal 48kHz x1 */
	snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);		snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);
	//snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K \| EMU_HANA_WCLOCK_4X );		/* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K \| EMU_HANA_WCLOCK_4X); */
	emu->emu1010.internal_clock = 1; /* 48000 */		emu->emu1010.internal_clock = 1; /* 48000 */
	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12); /* Set LEDs on Audio Dock */		snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12); /* Set LEDs on Audio Dock */
	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x1); /* Unmute all */		snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x1); /* Unmute all */
	//snd_emu1010_fpga_write(emu, 0x7, 0x0); /* Mute all */		/* snd_emu1010_fpga_write(emu, 0x7, 0x0); / / Mute all */
	//snd_emu1010_fpga_write(emu, 0x7, 0x1); /* Unmute all */		/* snd_emu1010_fpga_write(emu, 0x7, 0x1); / / Unmute all */
	//snd_emu1010_fpga_write(emu, 0xe, 0x12); /* Set LEDs on Audio Dock */		/* snd_emu1010_fpga_write(emu, 0xe, 0x12); / / Set LEDs on Audio Dock */

	return 0;		return 0;
	}		}
	@@ -1724,7 +1726,8 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
	*remu = NULL;		*remu = NULL;

	/* enable PCI device */		/* enable PCI device */
	if ((err = pci_enable_device(pci)) < 0)		err = pci_enable_device(pci);
			if (err < 0)
	return err;		return err;

	emu = kzalloc(sizeof(*emu), GFP_KERNEL);		emu = kzalloc(sizeof(*emu), GFP_KERNEL);
	@@ -1756,9 +1759,10 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
	for (c = emu_chip_details; c->vendor; c++) {		for (c = emu_chip_details; c->vendor; c++) {
	if (c->vendor == pci->vendor && c->device == pci->device) {		if (c->vendor == pci->vendor && c->device == pci->device) {
	if (subsystem) {		if (subsystem) {
	if (c->subsystem && (c->subsystem == subsystem) ) {		if (c->subsystem && (c->subsystem == subsystem))
	break;		break;
	} else continue;		else
			continue;
	} else {		} else {
	if (c->subsystem && (c->subsystem != emu->serial))		if (c->subsystem && (c->subsystem != emu->serial))
	continue;		continue;
	@@ -1778,11 +1782,15 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
	if (c->subsystem && !subsystem)		if (c->subsystem && !subsystem)
	snd_printdd("Sound card name = %s\n", c->name);		snd_printdd("Sound card name = %s\n", c->name);
	else if (subsystem)		else if (subsystem)
	snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x. Forced to subsytem=0x%x\n",		snd_printdd("Sound card name = %s, "
	c->name, pci->vendor, pci->device, emu->serial, c->subsystem);		"vendor = 0x%x, device = 0x%x, subsystem = 0x%x. "
			"Forced to subsytem = 0x%x\n", c->name,
			pci->vendor, pci->device, emu->serial, c->subsystem);
	else		else
	snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x.\n",		snd_printdd("Sound card name = %s, "
	c->name, pci->vendor, pci->device, emu->serial);		"vendor = 0x%x, device = 0x%x, subsystem = 0x%x.\n",
			c->name, pci->vendor, pci->device,
			emu->serial);

	if (!*card->id && c->id) {		if (!*card->id && c->id) {
	int i, n = 0;		int i, n = 0;
	@@ -1817,7 +1825,8 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
	else		else
	emu->gpr_base = FXGPREGBASE;		emu->gpr_base = FXGPREGBASE;

	if ((err = pci_request_regions(pci, "EMU10K1")) < 0) {		err = pci_request_regions(pci, "EMU10K1");
			if (err < 0) {
	kfree(emu);		kfree(emu);
	pci_disable_device(pci);		pci_disable_device(pci);
	return err;		return err;
	@@ -1864,21 +1873,25 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
	emu->enable_ir = enable_ir;		emu->enable_ir = enable_ir;

	if (emu->card_capabilities->ca_cardbus_chip) {		if (emu->card_capabilities->ca_cardbus_chip) {
	if ((err = snd_emu10k1_cardbus_init(emu)) < 0)		err = snd_emu10k1_cardbus_init(emu);
			if (err < 0)
	goto error;		goto error;
	}		}
	if (emu->card_capabilities->ecard) {		if (emu->card_capabilities->ecard) {
	if ((err = snd_emu10k1_ecard_init(emu)) < 0)		err = snd_emu10k1_ecard_init(emu);
			if (err < 0)
	goto error;		goto error;
	} else if (emu->card_capabilities->emu_model) {		} else if (emu->card_capabilities->emu_model) {
	if ((err = snd_emu10k1_emu1010_init(emu)) < 0) {		err = snd_emu10k1_emu1010_init(emu);
			if (err < 0) {
	snd_emu10k1_free(emu);		snd_emu10k1_free(emu);
	return err;		return err;
	}		}
	} else {		} else {
	/* 5.1: Enable the additional AC97 Slots. If the emu10k1 version		/* 5.1: Enable the additional AC97 Slots. If the emu10k1 version
	does not support this, it shouldn't do any harm */		does not support this, it shouldn't do any harm */
	snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR\|AC97SLOT_LFE);		snd_emu10k1_ptr_write(emu, AC97SLOT, 0,
			AC97SLOT_CNTR\|AC97SLOT_LFE);
	}		}

	/* initialize TRAM setup */		/* initialize TRAM setup */
	@@ -1931,19 +1944,23 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
	emu->voices[idx].number = idx;		emu->voices[idx].number = idx;
	}		}

	if ((err = snd_emu10k1_init(emu, enable_ir, 0)) < 0)		err = snd_emu10k1_init(emu, enable_ir, 0);
			if (err < 0)
	goto error;		goto error;
	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	if ((err = alloc_pm_buffer(emu)) < 0)		err = alloc_pm_buffer(emu);
			if (err < 0)
	goto error;		goto error;
	#endif		#endif

	/* Initialize the effect engine */		/* Initialize the effect engine */
	if ((err = snd_emu10k1_init_efx(emu)) < 0)		err = snd_emu10k1_init_efx(emu);
			if (err < 0)
	goto error;		goto error;
	snd_emu10k1_audio_enable(emu);		snd_emu10k1_audio_enable(emu);

	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops)) < 0)		err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops);
			if (err < 0)
	goto error;		goto error;

	#ifdef CONFIG_PROC_FS		#ifdef CONFIG_PROC_FS