ALSA: rme96: Use standard printk helpers (342cd934) · Commits · 戴 / test

sound/pci/rme96.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1609,13 +1609,15 @@ snd_rme96_create(struct rme96 *rme96)

		rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE);
		if (!rme96->iobase) {
		snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);
		dev_err(rme96->card->dev,
		"unable to remap memory region 0x%lx-0x%lx\n",
		rme96->port, rme96->port + RME96_IO_SIZE - 1);
		return -ENOMEM;
		}

		if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED,
		KBUILD_MODNAME, rme96)) {
		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
		dev_err(rme96->card->dev, "unable to grab IRQ %d\n", pci->irq);
		return -EBUSY;
		}
		rme96->irq = pci->irq;
		@@ -2414,7 +2416,7 @@ static int rme96_resume(struct device *dev)

		pci_restore_state(pci);
		if (pci_enable_device(pci) < 0) {
		printk(KERN_ERR "rme96: pci_enable_device failed, disabling device\n");
		dev_err(dev, "pci_enable_device failed, disabling device\n");
		snd_card_disconnect(card);
		return -EIO;
		}
		@@ -2494,14 +2496,14 @@ snd_rme96_probe(struct pci_dev *pci,
		#ifdef CONFIG_PM_SLEEP
		rme96->playback_suspend_buffer = vmalloc(RME96_BUFFER_SIZE);
		if (!rme96->playback_suspend_buffer) {
		snd_printk(KERN_ERR
		dev_err(card->dev,
		"Failed to allocate playback suspend buffer!\n");
		snd_card_free(card);
		return -ENOMEM;
		}
		rme96->capture_suspend_buffer = vmalloc(RME96_BUFFER_SIZE);
		if (!rme96->capture_suspend_buffer) {
		snd_printk(KERN_ERR
		dev_err(card->dev,
		"Failed to allocate capture suspend buffer!\n");
		snd_card_free(card);
		return -ENOMEM;