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

Commit 6f002b02 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: emu10k1: Use standard printk helpers 



Convert with dev_err() and co from snd_printk(), etc.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 26bc6964

sound/pci/emu10k1/emu10k1.c

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,8 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci, 
	if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,

			       sizeof(struct snd_emu10k1_synth_arg), &wave) < 0 ||

	    wave == NULL) {

		snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n");

		dev_warn(emu->card->dev,

			 "can't initialize Emu10k1 wavetable synth\n");

	} else {

		struct snd_emu10k1_synth_arg *arg;

		arg = SNDRV_SEQ_DEVICE_ARGPTR(wave);
@@ -247,8 +248,7 @@ static int snd_emu10k1_resume(struct device *dev) 
	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {

		printk(KERN_ERR "emu10k1: pci_enable_device failed, "

		       "disabling device\n");

		dev_err(dev, "pci_enable_device failed, disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

sound/pci/emu10k1/emu10k1_callback.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw) 
			vp = &emu->voices[best[i].voice];

			if ((ch = vp->ch) < 0) {

				/*

				printk(KERN_WARNING

				dev_warn(emu->card->dev,

				       "synth_get_voice: ch < 0 (%d) ??", i);

				*/

				continue;
@@ -339,7 +339,7 @@ start_voice(struct snd_emux_voice *vp) 
		return -EINVAL;

	emem->map_locked++;

	if (snd_emu10k1_memblk_map(hw, emem) < 0) {

		/* printk(KERN_ERR "emu: cannot map!\n"); */

		/* dev_err(hw->card->devK, "emu: cannot map!\n"); */

		return -ENOMEM;

	}

	mapped_offset = snd_emu10k1_memblk_offset(emem) >> 1;

sound/pci/emu10k1/emu10k1_main.c

+45 −28
Original line number Diff line number Diff line
@@ -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 */

		/* Hacks for Alice3 to work independent of haP16V driver */

		snd_printk(KERN_INFO "Audigy2 value: Special config.\n");

		dev_info(emu->card->dev, "Audigy2 value: Special config.\n");

		/* Setup SRCMulti_I2S SamplingRate */

		tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);

		tmp &= 0xfffff1ff;
@@ -723,7 +723,8 @@ static int emu1010_firmware_thread(void *data) 
		if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {

			/* Audio Dock attached */

			/* Return to Audio Dock programming mode */

			snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");

			dev_info(emu->card->dev,

				 "emu1010: Loading Audio Dock Firmware\n");

			snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK);



			if (!emu->dock_fw) {
@@ -756,19 +757,25 @@ static int emu1010_firmware_thread(void *data) 


			snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);

			snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg);

			snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n", reg);

			dev_info(emu->card->dev,

				 "emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n",

				 reg);

			/* ID, should read & 0x7f = 0x55 when FPGA programmed. */

			snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);

			snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", reg);

			dev_info(emu->card->dev,

				 "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", reg);

			if ((reg & 0x1f) != 0x15) {

				/* FPGA failed to be programmed */

				snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n", reg);

				dev_info(emu->card->dev,

					 "emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n",

					 reg);

				continue;

			}

			snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");

			dev_info(emu->card->dev,

				 "emu1010: Audio Dock Firmware loaded\n");

			snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);

			snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);

			snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",

			dev_info(emu->card->dev, "Audio Dock ver: %u.%u\n",

				   tmp, tmp2);

			/* Sync clocking between 1010 and Dock */

			/* Allow DLL to settle */
@@ -777,7 +784,7 @@ static int emu1010_firmware_thread(void *data) 
			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);

		}

	}

	snd_printk(KERN_INFO "emu1010: firmware thread stopping\n");

	dev_info(emu->card->dev, "emu1010: firmware thread stopping\n");

	return 0;

}
@@ -818,7 +825,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
	u32 tmp, tmp2, reg;

	int err;



	snd_printk(KERN_INFO "emu1010: Special config.\n");

	dev_info(emu->card->dev, "emu1010: Special config.\n");

	/* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,

	 * Lock Sound Memory Cache, Lock Tank Memory Cache,

	 * Mute all codecs.
@@ -843,7 +850,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 


	/* ID, should read & 0x7f = 0x55. (Bit 7 is the IRQ bit) */

	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);

	snd_printdd("reg1 = 0x%x\n", reg);

	dev_dbg(emu->card->dev, "reg1 = 0x%x\n", reg);

	if ((reg & 0x3f) == 0x15) {

		/* FPGA netlist already present so clear it */

		/* Return to programming mode */
@@ -851,13 +858,14 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
		snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0x02);

	}

	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);

	snd_printdd("reg2 = 0x%x\n", reg);

	dev_dbg(emu->card->dev, "reg2 = 0x%x\n", reg);

	if ((reg & 0x3f) == 0x15) {

		/* FPGA failed to return to programming mode */

		snd_printk(KERN_INFO "emu1010: FPGA failed to return to programming mode\n");

		dev_info(emu->card->dev,

			 "emu1010: FPGA failed to return to programming mode\n");

		return -ENODEV;

	}

	snd_printk(KERN_INFO "emu1010: EMU_HANA_ID = 0x%x\n", reg);

	dev_info(emu->card->dev, "emu1010: EMU_HANA_ID = 0x%x\n", reg);



	if (!emu->firmware) {

		const char *filename;
@@ -880,16 +888,19 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 


		err = request_firmware(&emu->firmware, filename, &emu->pci->dev);

		if (err != 0) {

			snd_printk(KERN_ERR "emu1010: firmware: %s not found. Err = %d\n", filename, err);

			dev_info(emu->card->dev,

				 "emu1010: firmware: %s not found. Err = %d\n",

				 filename, err);

			return err;

		}

		snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n",

		dev_info(emu->card->dev,

			 "emu1010: firmware file = %s, size = 0x%zx\n",

			   filename, emu->firmware->size);

	}



	err = snd_emu1010_load_firmware(emu, emu->firmware);

	if (err != 0) {

		snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n");

		dev_info(emu->card->dev, "emu1010: Loading Firmware failed\n");

		return err;

	}
@@ -897,21 +908,23 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);

	if ((reg & 0x3f) != 0x15) {

		/* FPGA failed to be programmed */

		snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file failed, reg = 0x%x\n", reg);

		dev_info(emu->card->dev,

			 "emu1010: Loading Hana Firmware file failed, reg = 0x%x\n",

			 reg);

		return -ENODEV;

	}



	snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");

	dev_info(emu->card->dev, "emu1010: Hana Firmware loaded\n");

	snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);

	snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);

	snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);

	dev_info(emu->card->dev, "emu1010: Hana version: %u.%u\n", tmp, tmp2);

	/* Enable 48Volt power to Audio Dock */

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);



	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);

	snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);

	dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);

	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);

	snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);

	dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);

	snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp);

	/* Optical -> ADAT I/O  */

	/* 0 : SPDIF
@@ -950,7 +963,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
	snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);



	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);

	snd_printk(KERN_INFO "emu1010: Card options3 = 0x%x\n", reg);

	dev_info(emu->card->dev, "emu1010: Card options3 = 0x%x\n", reg);

	/* Default WCLK set to 48kHz. */

	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);

	/* Word Clock source, Internal 48kHz x1 */
@@ -1808,7 +1821,9 @@ int snd_emu10k1_create(struct snd_card *card, 
	emu->revision = pci->revision;

	pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);

	pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);

	snd_printdd("vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n", pci->vendor, pci->device, emu->serial, emu->model);

	dev_dbg(card->dev,

		"vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n",

		pci->vendor, pci->device, emu->serial, emu->model);



	for (c = emu_chip_details; c->vendor; c++) {

		if (c->vendor == pci->vendor && c->device == pci->device) {
@@ -1827,21 +1842,21 @@ int snd_emu10k1_create(struct snd_card *card, 
		}

	}

	if (c->vendor == 0) {

		snd_printk(KERN_ERR "emu10k1: Card not recognised\n");

		dev_err(card->dev, "emu10k1: Card not recognised\n");

		kfree(emu);

		pci_disable_device(pci);

		return -ENOENT;

	}

	emu->card_capabilities = c;

	if (c->subsystem && !subsystem)

		snd_printdd("Sound card name = %s\n", c->name);

		dev_dbg(card->dev, "Sound card name = %s\n", c->name);

	else if (subsystem)

		snd_printdd("Sound card name = %s, "

		dev_dbg(card->dev, "Sound card name = %s, "

			"vendor = 0x%x, device = 0x%x, subsystem = 0x%x. "

			"Forced to subsystem = 0x%x\n",	c->name,

			pci->vendor, pci->device, emu->serial, c->subsystem);

	else

		snd_printdd("Sound card name = %s, "

		dev_dbg(card->dev, "Sound card name = %s, "

			"vendor = 0x%x, device = 0x%x, subsystem = 0x%x.\n",

			c->name, pci->vendor, pci->device,

			emu->serial);
@@ -1869,7 +1884,9 @@ int snd_emu10k1_create(struct snd_card *card, 
	emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;

	if (pci_set_dma_mask(pci, emu->dma_mask) < 0 ||

	    pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {

		snd_printk(KERN_ERR "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask);

		dev_err(card->dev,

			"architecture does not support PCI busmaster DMA with mask 0x%lx\n",

			emu->dma_mask);

		kfree(emu);

		pci_disable_device(pci);

		return -ENXIO;

sound/pci/emu10k1/emu10k1_patch.c

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp, 
		return -EINVAL;



	if (sp->v.size == 0) {

		snd_printd("emu: rom font for sample %d\n", sp->v.sample);

		dev_dbg(emu->card->dev,

			"emu: rom font for sample %d\n", sp->v.sample);

		return 0;

	}
@@ -92,7 +93,8 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp, 
		blocksize *= 2;

	sp->block = snd_emu10k1_synth_alloc(emu, blocksize);

	if (sp->block == NULL) {

		snd_printd("emu10k1: synth malloc failed (size=%d)\n", blocksize);

		dev_dbg(emu->card->dev,

			"synth malloc failed (size=%d)\n", blocksize);

		/* not ENOMEM (for compatibility with OSS) */

		return -ENOSPC;

	}

sound/pci/emu10k1/emufx.c

+7 −5
Original line number Diff line number Diff line
@@ -1547,7 +1547,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
	/* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */

	if (emu->card_capabilities->emu_model) {

		/* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */

		snd_printk(KERN_INFO "EMU outputs on\n");

		dev_info(emu->card->dev, "EMU outputs on\n");

		for (z = 0; z < 8; z++) {

			if (emu->card_capabilities->ca0108_chip) {

				A_OP(icode, &ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
@@ -1571,7 +1571,9 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
		A_SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);

		if ((z==1) && (emu->card_capabilities->spdif_bug)) {

			/* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */

			snd_printk(KERN_INFO "Installing spdif_bug patch: %s\n", emu->card_capabilities->name);

			dev_info(emu->card->dev,

				 "Installing spdif_bug patch: %s\n",

				 emu->card_capabilities->name);

			A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000);

			A_OP(icode, &ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);

		} else {
@@ -1595,7 +1597,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 


	if (emu->card_capabilities->emu_model) {

		if (emu->card_capabilities->ca0108_chip) {

			snd_printk(KERN_INFO "EMU2 inputs on\n");

			dev_info(emu->card->dev, "EMU2 inputs on\n");

			for (z = 0; z < 0x10; z++) {

				snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, 

									bit_shifter16,
@@ -1603,11 +1605,11 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 
									A_FXBUS2(z*2) );

			}

		} else {

			snd_printk(KERN_INFO "EMU inputs on\n");

			dev_info(emu->card->dev, "EMU inputs on\n");

			/* Capture 16 (originally 8) channels of S32_LE sound */



			/*

			printk(KERN_DEBUG "emufx.c: gpr=0x%x, tmp=0x%x\n",

			dev_dbg(emu->card->dev, "emufx.c: gpr=0x%x, tmp=0x%x\n",

			       gpr, tmp);

			*/

			/* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */