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

Commit 0cae90a9 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Takashi Iwai
Browse files

ALSA: ctxfi: pr_* replaced with dev_* 



pr_* macros replaced with dev_* as they are more preffered over pr_*.
each file which had pr_* was reviewed manually and replaced with dev_*.
here we have actually used the various snd_card which was added to some
structures of ctxfi via a previous patch of this series.

in the ctvmem.c file we have passed a reference of ct_atc as an
argument to get_vm_block function so that it can be used from
dev_*.

since dev_* will print the device information , so the prefix of
"ctxfi" from the various pr_* were also removed.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a45c4d51

sound/pci/ctxfi/ctamixer.c

+4 −2
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ static int get_amixer_rsc(struct amixer_mgr *mgr, 
	}

	spin_unlock_irqrestore(&mgr->mgr_lock, flags);

	if (err) {

		pr_err("ctxfi: Can't meet AMIXER resource request!\n");

		dev_err(mgr->card->dev,

			"Can't meet AMIXER resource request!\n");

		goto error;

	}
@@ -412,7 +413,8 @@ static int get_sum_rsc(struct sum_mgr *mgr, 
	}

	spin_unlock_irqrestore(&mgr->mgr_lock, flags);

	if (err) {

		pr_err("ctxfi: Can't meet SUM resource request!\n");

		dev_err(mgr->card->dev,

			"Can't meet SUM resource request!\n");

		goto error;

	}

sound/pci/ctxfi/ctatc.c

+16 −11
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static unsigned int convert_format(snd_pcm_format_t snd_format, 
	case SNDRV_PCM_FORMAT_FLOAT_LE:

		return SRC_SF_F32;

	default:

		pr_err("ctxfi: not recognized snd format is %d\n",

		dev_err(card->dev, "not recognized snd format is %d\n",

			snd_format);

		return SRC_SF_S16;

	}
@@ -1286,7 +1286,8 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) 
	p = snd_pci_quirk_lookup_id(vendor_id, device_id, list);

	if (p) {

		if (p->value < 0) {

			pr_err("ctxfi: Device %04x:%04x is black-listed\n",

			dev_err(atc->card->dev,

				"Device %04x:%04x is black-listed\n",

				vendor_id, device_id);

			return -ENOENT;

		}
@@ -1318,7 +1319,8 @@ int ct_atc_create_alsa_devs(struct ct_atc *atc) 
		err = alsa_dev_funcs[i].create(atc, i,

				alsa_dev_funcs[i].public_name);

		if (err) {

			pr_err("ctxfi: Creating alsa device %d failed!\n", i);

			dev_err(atc->card->dev,

				"Creating alsa device %d failed!\n", i);

			return err;

		}

	}
@@ -1334,7 +1336,7 @@ static int atc_create_hw_devs(struct ct_atc *atc) 


	err = create_hw_obj(atc->pci, atc->chip_type, atc->model, &hw);

	if (err) {

		pr_err("Failed to create hw obj!!!\n");

		dev_err(atc->card->dev, "Failed to create hw obj!!!\n");

		return err;

	}

	hw->card = atc->card;
@@ -1354,7 +1356,8 @@ static int atc_create_hw_devs(struct ct_atc *atc) 


		err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]);

		if (err) {

			pr_err("ctxfi: Failed to create rsc_mgr %d!!!\n", i);

			dev_err(atc->card->dev,

				"Failed to create rsc_mgr %d!!!\n", i);

			return err;

		}

	}
@@ -1401,7 +1404,8 @@ static int atc_get_resources(struct ct_atc *atc) 
		err = daio_mgr->get_daio(daio_mgr, &da_desc,

					(struct daio **)&atc->daios[i]);

		if (err) {

			pr_err("ctxfi: Failed to get DAIO resource %d!!!\n",

			dev_err(atc->card->dev,

				"Failed to get DAIO resource %d!!!\n",

				i);

			return err;

		}
@@ -1605,7 +1609,8 @@ static int atc_resume(struct ct_atc *atc) 
	/* Do hardware resume. */

	err = atc_hw_resume(atc);

	if (err < 0) {

		pr_err("ctxfi: pci_enable_device failed, disabling device\n");

		dev_err(atc->card->dev,

			"pci_enable_device failed, disabling device\n");

		snd_card_disconnect(atc->card);

		return err;

	}
@@ -1702,7 +1707,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, 
	/* Find card model */

	err = atc_identify_card(atc, ssid);

	if (err < 0) {

		pr_err("ctatc: Card not recognised\n");

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

		goto error1;

	}
@@ -1718,7 +1723,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, 


	err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer);

	if (err) {

		pr_err("ctxfi: Failed to create mixer obj!!!\n");

		dev_err(card->dev, "Failed to create mixer obj!!!\n");

		goto error1;

	}
@@ -1745,6 +1750,6 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, 


error1:

	ct_atc_destroy(atc);

	pr_err("ctxfi: Something wrong!!!\n");

	dev_err(card->dev, "Something wrong!!!\n");

	return err;

}

sound/pci/ctxfi/ctdaio.c

+2 −1
Original line number Diff line number Diff line
@@ -539,7 +539,8 @@ static int get_daio_rsc(struct daio_mgr *mgr, 
	err = daio_mgr_get_rsc(&mgr->mgr, desc->type);

	spin_unlock_irqrestore(&mgr->mgr_lock, flags);

	if (err) {

		pr_err("Can't meet DAIO resource request!\n");

		dev_err(mgr->card->dev,

			"Can't meet DAIO resource request!\n");

		return err;

	}

sound/pci/ctxfi/cthw20k1.c

+9 −6
Original line number Diff line number Diff line
@@ -1268,7 +1268,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info) 


	/* Set up device page table */

	if ((~0UL) == info->vm_pgt_phys) {

		pr_err("Wrong device page table page address!\n");

		dev_err(hw->card->dev,

			"Wrong device page table page address!\n");

		return -1;

	}
@@ -1327,7 +1328,7 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr) 
		mdelay(40);

	}

	if (i >= 3) {

		pr_alert("PLL initialization failed!!!\n");

		dev_alert(hw->card->dev, "PLL initialization failed!!!\n");

		return -EBUSY;

	}
@@ -1351,7 +1352,7 @@ static int hw_auto_init(struct hw *hw) 
			break;

	}

	if (!get_field(gctl, GCTL_AID)) {

		pr_alert("Card Auto-init failed!!!\n");

		dev_alert(hw->card->dev, "Card Auto-init failed!!!\n");

		return -EBUSY;

	}
@@ -1911,7 +1912,8 @@ static int hw_card_start(struct hw *hw) 
	/* Set DMA transfer mask */

	if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||

	    pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {

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

		dev_err(hw->card->dev,

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

			CT_XFI_DMA_MASK);

		err = -ENXIO;

		goto error1;
@@ -1941,7 +1943,8 @@ static int hw_card_start(struct hw *hw) 
		err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED,

				  KBUILD_MODNAME, hw);

		if (err < 0) {

			pr_err("XFi: Cannot get irq %d\n", pci->irq);

			dev_err(hw->card->dev,

				"XFi: Cannot get irq %d\n", pci->irq);

			goto error2;

		}

		hw->irq = pci->irq;

sound/pci/ctxfi/cthw20k2.c

+15 −9
Original line number Diff line number Diff line
@@ -1187,7 +1187,8 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info) 
		hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);

		hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);

	} else {

		pr_alert("ctxfi: ERROR!!! Invalid sampling rate!!!\n");

		dev_alert(hw->card->dev,

			  "ERROR!!! Invalid sampling rate!!!\n");

		return -EINVAL;

	}
@@ -1246,7 +1247,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info) 


	/* Set up device page table */

	if ((~0UL) == info->vm_pgt_phys) {

		pr_alert("ctxfi: Wrong device page table page address!!!\n");

		dev_alert(hw->card->dev,

			  "Wrong device page table page address!!!\n");

		return -1;

	}
@@ -1351,7 +1353,8 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr) 
		break;

	}

	if (i >= 1000) {

		pr_alert("ctxfi: PLL initialization failed!!!\n");

		dev_alert(hw->card->dev,

			  "PLL initialization failed!!!\n");

		return -EBUSY;

	}
@@ -1375,7 +1378,7 @@ static int hw_auto_init(struct hw *hw) 
			break;

	}

	if (!get_field(gctl, GCTL_AID)) {

		pr_alert("ctxfi: Card Auto-init failed!!!\n");

		dev_alert(hw->card->dev, "Card Auto-init failed!!!\n");

		return -EBUSY;

	}
@@ -1846,7 +1849,7 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) 
	/* Initialize I2C */

	err = hw20k2_i2c_init(hw, 0x1A, 1, 1);

	if (err < 0) {

		pr_alert("ctxfi: Failure to acquire I2C!!!\n");

		dev_alert(hw->card->dev, "Failure to acquire I2C!!!\n");

		goto error;

	}
@@ -1889,7 +1892,8 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) 
		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A),

						MAKE_WM8775_DATA(0x0A));

	} else {

		pr_alert("ctxfi: Invalid master sampling rate (msr %d)!!!\n",

		dev_alert(hw->card->dev,

			  "Invalid master sampling rate (msr %d)!!!\n",

			  info->msr);

		err = -EINVAL;

		goto error;
@@ -2033,7 +2037,8 @@ static int hw_card_start(struct hw *hw) 
	/* Set DMA transfer mask */

	if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||

	    pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {

		pr_err("ctxfi: architecture does not support PCI busmaster DMA with mask 0x%llx\n",

		dev_err(hw->card->dev,

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

			CT_XFI_DMA_MASK);

		err = -ENXIO;

		goto error1;
@@ -2062,7 +2067,8 @@ static int hw_card_start(struct hw *hw) 
		err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,

				  KBUILD_MODNAME, hw);

		if (err < 0) {

			pr_err("XFi: Cannot get irq %d\n", pci->irq);

			dev_err(hw->card->dev,

				"XFi: Cannot get irq %d\n", pci->irq);

			goto error2;

		}

		hw->irq = pci->irq;