Changeset 679 for GPL/trunk/alsa-kernel/pci/emu10k1/irq.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/irq.c (modified) (7 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/irq.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -9 +10 @@
  *  TODO:
  *    --
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
  */
 
@@ -42 +28 @@
                 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;
@@ -158 +145 @@
                                 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) {
@@ -164 +151 @@
                                                 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);
                                         }
@@ -181 +171 @@
                 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 |
@@ -203 +194 @@
         }
         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);