ALSA: emu10k1: Use standard printk helpers

[deliverable/linux.git] / sound / pci / emu10k1 / irq.c

diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index 30bfed6f83398d5f9b17fdf776ce2ab6ebac7a4e..3c5c5e3dc2d97b885bdf861594b82a3b52db12d1 100644 (file)
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -41,11 +41,12 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)
                orig_status = status;
                handled = 1;
                if ((status & 0xffffffff) == 0xffffffff) {
-                       snd_printk(KERN_INFO "snd-emu10k1: Suspected sound card removal\n");
+                       dev_info(emu->card->dev,
+                                "Suspected sound card removal\n");
                        break;
                }
                if (status & IPR_PCIERROR) {
-                       snd_printk(KERN_ERR "interrupt: PCI error\n");
+                       dev_err(emu->card->dev, "interrupt: PCI error\n");
                        snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE);
                        status &= ~IPR_PCIERROR;
                }
@@ -157,19 +158,22 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)
                                struct snd_emu10k1_voice *pvoice = &(emu->p16v_voices[0]);
                                struct snd_emu10k1_voice *cvoice = &(emu->p16v_capture_voice);
 
-                               //printk(KERN_INFO "status2=0x%x\n", status2);
+                               /* dev_dbg(emu->card->dev, "status2=0x%x\n", status2); */
                                orig_status2 = status2;
                                if(status2 & mask) {
                                        if(pvoice->use) {
                                                snd_pcm_period_elapsed(pvoice->epcm->substream);
                                        } else { 
-                                               snd_printk(KERN_ERR "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n", status2, mask, pvoice, pvoice->use);
+                                               dev_err(emu->card->dev,
+                                                       "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n",
+                                                       status2, mask, pvoice,
+                                                       pvoice->use);
                                        }
                                }
                                if(status2 & 0x110000) {
-                                       //printk(KERN_INFO "capture int found\n");
+                                       /* dev_info(emu->card->dev, "capture int found\n"); */
                                        if(cvoice->use) {
-                                               //printk(KERN_INFO "capture period_elapsed\n");
+                                               /* dev_info(emu->card->dev, "capture period_elapsed\n"); */
                                                snd_pcm_period_elapsed(cvoice->epcm->substream);
                                        }
                                }
@@ -180,7 +184,8 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)
 
                if (status) {
                        unsigned int bits;
-                       snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 0x%08x\n", status);
+                       dev_err(emu->card->dev,
+                               "unhandled interrupt: 0x%08x\n", status);
                        //make sure any interrupts we don't handle are disabled:
                        bits = INTE_FXDSPENABLE |
                                INTE_PCIERRORENABLE |
@@ -202,7 +207,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)
                outl(orig_status, emu->port + IPR); /* ack all */
        }
        if (timeout == 1000)
-               snd_printk(KERN_INFO "emu10k1 irq routine failure\n");
+               dev_info(emu->card->dev, "emu10k1 irq routine failure\n");
 
        return IRQ_RETVAL(handled);
 }