ALSA: ad1889: Use standard printk helpers (29633004) · Commits · 戴 / test

sound/pci/ad1889.c

+15 −17

Original line number	Diff line number	Diff line
		@@ -77,9 +77,6 @@ MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
		#define DEVNAME "ad1889"
		#define PFX DEVNAME ": "

		/* let's use the global sound debug interfaces */
		#define ad1889_debug(fmt, arg...) snd_printd(KERN_DEBUG fmt, ## arg)

		/* keep track of some hw registers */
		struct ad1889_register_state {
		u16 reg; /* reg setup */
		@@ -264,11 +261,11 @@ snd_ad1889_ac97_ready(struct snd_ad1889 *chip)
		&& --retry)
		mdelay(1);
		if (!retry) {
		snd_printk(KERN_ERR PFX "[%s] Link is not ready.\n",
		dev_err(chip->card->dev, "[%s] Link is not ready.\n",
		__func__);
		return -EIO;
		}
		ad1889_debug("[%s] ready after %d ms\n", __func__, 400 - retry);
		dev_dbg(chip->card->dev, "[%s] ready after %d ms\n", __func__, 400 - retry);

		return 0;
		}
		@@ -405,9 +402,9 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)

		spin_unlock_irq(&chip->lock);

		ad1889_debug("prepare playback: addr = 0x%x, count = %u, "
		"size = %u, reg = 0x%x, rate = %u\n", chip->wave.addr,
		count, size, reg, rt->rate);
		dev_dbg(chip->card->dev,
		"prepare playback: addr = 0x%x, count = %u, size = %u, reg = 0x%x, rate = %u\n",
		chip->wave.addr, count, size, reg, rt->rate);
		return 0;
		}

		@@ -452,9 +449,9 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)

		spin_unlock_irq(&chip->lock);

		ad1889_debug("prepare capture: addr = 0x%x, count = %u, "
		"size = %u, reg = 0x%x, rate = %u\n", chip->ramc.addr,
		count, size, reg, rt->rate);
		dev_dbg(chip->card->dev,
		"prepare capture: addr = 0x%x, count = %u, size = %u, reg = 0x%x, rate = %u\n",
		chip->ramc.addr, count, size, reg, rt->rate);
		return 0;
		}

		@@ -614,7 +611,8 @@ snd_ad1889_interrupt(int irq, void *dev_id)
		return IRQ_NONE;

		if (st & (AD_DMA_DISR_PMAI\|AD_DMA_DISR_PTAI))
		ad1889_debug("Unexpected master or target abort interrupt!\n");
		dev_dbg(chip->card->dev,
		"Unexpected master or target abort interrupt!\n");

		if ((st & AD_DMA_DISR_WAVI) && chip->psubs)
		snd_pcm_period_elapsed(chip->psubs);
		@@ -656,7 +654,7 @@ snd_ad1889_pcm_init(struct snd_ad1889 chip, int device, struct snd_pcm *rpcm)
		BUFFER_BYTES_MAX);

		if (err < 0) {
		snd_printk(KERN_ERR PFX "buffer allocation error: %d\n", err);
		dev_err(chip->card->dev, "buffer allocation error: %d\n", err);
		return err;
		}

		@@ -912,7 +910,7 @@ snd_ad1889_create(struct snd_card *card,
		/* check PCI availability (32bit DMA) */
		if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 \|\|
		pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
		printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");
		dev_err(card->dev, "error setting 32-bit DMA mask.\n");
		pci_disable_device(pci);
		return -ENXIO;
		}
		@@ -935,7 +933,7 @@ snd_ad1889_create(struct snd_card *card,
		chip->bar = pci_resource_start(pci, 0);
		chip->iobase = pci_ioremap_bar(pci, 0);
		if (chip->iobase == NULL) {
		printk(KERN_ERR PFX "unable to reserve region.\n");
		dev_err(card->dev, "unable to reserve region.\n");
		err = -EBUSY;
		goto free_and_ret;
		}
		@@ -946,7 +944,7 @@ snd_ad1889_create(struct snd_card *card,

		if (request_irq(pci->irq, snd_ad1889_interrupt,
		IRQF_SHARED, KBUILD_MODNAME, chip)) {
		printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
		dev_err(card->dev, "cannot obtain IRQ %d\n", pci->irq);
		snd_ad1889_free(chip);
		return -EBUSY;
		}

Admin message