ALSA: atiixp: Use standard printk helpers

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

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 14 insertions, 15 deletions

diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 85f893b5cc99..ae07b4926dc2 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -432,7 +432,7 @@ static int snd_atiixp_acquire_codec(struct atiixp *chip)
 
         while (atiixp_read(chip, PHYS_OUT_ADDR) & ATI_REG_PHYS_OUT_ADDR_EN) {
                 if (! timeout--) {
-                        snd_printk(KERN_WARNING "atiixp: codec acquire timeout\n");
+                        dev_warn(chip->card->dev, "codec acquire timeout\n");
                         return -EBUSY;
                 }
                 udelay(1);
@@ -463,7 +463,7 @@ static unsigned short snd_atiixp_codec_read(struct atiixp *chip, unsigned short
         } while (--timeout);
         /* time out may happen during reset */
         if (reg < 0x7c)
-                snd_printk(KERN_WARNING "atiixp: codec read timeout (reg %x)\n", reg);
+                dev_warn(chip->card->dev, "codec read timeout (reg %x)\n", reg);
         return 0xffff;
 }
 
@@ -523,7 +523,7 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)
                 mdelay(1);
                 atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
                 if (!--timeout) {
-                        snd_printk(KERN_ERR "atiixp: codec reset timeout\n");
+                        dev_err(chip->card->dev, "codec reset timeout\n");
                         break;
                 }
         }
@@ -567,9 +567,8 @@ static int ac97_probing_bugs(struct pci_dev *pci)
 
         q = snd_pci_quirk_lookup(pci, atiixp_quirks);
         if (q) {
-                snd_printdd(KERN_INFO
-                            "Atiixp quirk for %s.  Forcing codec %d\n",
-                            snd_pci_quirk_name(q), q->value);
+                dev_dbg(&pci->dev, "atiixp quirk for %s.  Forcing codec %d\n",
+                        snd_pci_quirk_name(q), q->value);
                 return q->value;
         }
         /* this hardware doesn't need workarounds.  Probe for codec */
@@ -600,7 +599,7 @@ static int snd_atiixp_codec_detect(struct atiixp *chip)
         atiixp_write(chip, IER, 0); /* disable irqs */
 
         if ((chip->codec_not_ready_bits & ALL_CODEC_NOT_READY) == ALL_CODEC_NOT_READY) {
-                snd_printk(KERN_ERR "atiixp: no codec detected!\n");
+                dev_err(chip->card->dev, "no codec detected!\n");
                 return -ENXIO;
         }
         return 0;
@@ -676,7 +675,7 @@ static snd_pcm_uframes_t snd_atiixp_pcm_pointer(struct snd_pcm_substream *substr
                         continue;
                 return bytes_to_frames(runtime, curptr);
         }
-        snd_printd("atiixp: invalid DMA pointer read 0x%x (buf=%x)\n",
+        dev_dbg(chip->card->dev, "invalid DMA pointer read 0x%x (buf=%x)\n",
                    readl(chip->remap_addr + dma->ops->dt_cur), dma->buf_addr);
         return 0;
 }
@@ -688,7 +687,7 @@ static void snd_atiixp_xrun_dma(struct atiixp *chip, struct atiixp_dma *dma)
 {
         if (! dma->substream || ! dma->running)
                 return;
-        snd_printdd("atiixp: XRUN detected (DMA %d)\n", dma->ops->type);
+        dev_dbg(chip->card->dev, "XRUN detected (DMA %d)\n", dma->ops->type);
         snd_pcm_stream_lock(dma->substream);
         snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
         snd_pcm_stream_unlock(dma->substream);
@@ -1453,14 +1452,15 @@ static int snd_atiixp_mixer_new(struct atiixp *chip, int clock,
                         ac97.scaps |= AC97_SCAP_NO_SPDIF;
                 if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i])) < 0) {
                         chip->ac97[i] = NULL; /* to be sure */
-                        snd_printdd("atiixp: codec %d not available for audio\n", i);
+                        dev_dbg(chip->card->dev,
+                                "codec %d not available for audio\n", i);
                         continue;
                 }
                 codec_count++;
         }
 
         if (! codec_count) {
-                snd_printk(KERN_ERR "atiixp: no codec available\n");
+                dev_err(chip->card->dev, "no codec available\n");
                 return -ENODEV;
         }
 
@@ -1511,8 +1511,7 @@ static int snd_atiixp_resume(struct device *dev)
         pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
         if (pci_enable_device(pci) < 0) {
-                printk(KERN_ERR "atiixp: pci_enable_device failed, "
-                       "disabling device\n");
+                dev_err(dev, "pci_enable_device failed, disabling device\n");
                 snd_card_disconnect(card);
                 return -EIO;
         }
@@ -1637,14 +1636,14 @@ static int snd_atiixp_create(struct snd_card *card,
         chip->addr = pci_resource_start(pci, 0);
         chip->remap_addr = pci_ioremap_bar(pci, 0);
         if (chip->remap_addr == NULL) {
-                snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
+                dev_err(card->dev, "AC'97 space ioremap problem\n");
                 snd_atiixp_free(chip);
                 return -EIO;
         }
 
         if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
                         KBUILD_MODNAME, chip)) {
-                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
                 snd_atiixp_free(chip);
                 return -EBUSY;
         }