Changeset 777 for GPL/trunk/alsa-kernel/isa

Timestamp:

Apr 21, 2025, 7:17:25 PM (8 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/sb/sb_common.c (modified) (10 diffs)
• alsa-kernel/isa/sb/sb_mixer.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/isa/sb/sb_common.c

@@ -32 +32 @@
         int i;
 #ifdef IO_DEBUG
-        snd_printk(KERN_DEBUG "command 0x%x\n", val);
+        dev_dbg(chip->card->dev, "command 0x%x\n", val);
 #endif
         for (i = BUSY_LOOPS; i; i--)
@@ -39 +39 @@
                         return 1;
                 }
-        snd_printd("%s [0x%lx]: timeout (0x%x)\n", __func__, chip->port, val);
+        dev_dbg(chip->card->dev, "%s [0x%lx]: timeout (0x%x)\n", __func__, chip->port, val);
         return 0;
 }
@@ -51 +51 @@
                         val = inb(SBP(chip, READ));
 #ifdef IO_DEBUG
-                        snd_printk(KERN_DEBUG "get_byte 0x%x\n", val);
+                        dev_dbg(chip->card->dev, "get_byte 0x%x\n", val);
 #endif
                         return val;
                 }
         }
-        snd_printd("%s [0x%lx]: timeout\n", __func__, chip->port);
+        dev_dbg(chip->card->dev, "%s [0x%lx]: timeout\n", __func__, chip->port);
         return -ENODEV;
 }
@@ -75 +75 @@
                                 break;
                 }
-        snd_printdd("%s [0x%lx] failed...\n", __func__, chip->port);
+        if (chip->card)
+                dev_dbg(chip->card->dev, "%s [0x%lx] failed...\n", __func__, chip->port);
         return -ENODEV;
 }
@@ -113 +114 @@
         major = version >> 8;
         minor = version & 0xff;
-        snd_printdd("SB [0x%lx]: DSP chip found, version = %i.%i\n",
+        dev_dbg(chip->card->dev, "SB [0x%lx]: DSP chip found, version = %i.%i\n",
                     chip->port, major, minor);
 
@@ -141 +142 @@
                         break;
                 default:
-                        snd_printk(KERN_INFO "SB [0x%lx]: unknown DSP chip version %i.%i\n",
+                        dev_info(chip->card->dev, "SB [0x%lx]: unknown DSP chip version %i.%i\n",
                                    chip->port, major, minor);
                         return -ENODEV;
@@ -201 +202 @@
                              IRQF_SHARED : 0,
                              "SoundBlaster", (void *) chip)) {
-                snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
+                dev_err(card->dev, "sb: can't grab irq %d\n", irq);
                 return -EBUSY;
         }
@@ -213 +214 @@
                                              "SoundBlaster");
         if (!chip->res_port) {
-                snd_printk(KERN_ERR "sb: can't grab port 0x%lx\n", port);
+                dev_err(card->dev, "sb: can't grab port 0x%lx\n", port);
                 return -EBUSY;
         }
@@ -220 +221 @@
         if (dma8 >= 0 && snd_devm_request_dma(card->dev, dma8,
                                               "SoundBlaster - 8bit")) {
-                snd_printk(KERN_ERR "sb: can't grab DMA8 %d\n", dma8);
+                dev_err(card->dev, "sb: can't grab DMA8 %d\n", dma8);
                 return -EBUSY;
         }
@@ -230 +231 @@
                 } else if (snd_devm_request_dma(card->dev, dma16,
                                                 "SoundBlaster - 16bit")) {
-                        snd_printk(KERN_ERR "sb: can't grab DMA16 %d\n", dma16);
+                        dev_err(card->dev, "sb: can't grab DMA16 %d\n", dma16);
                         return -EBUSY;
                 }

GPL/trunk/alsa-kernel/isa/sb/sb_mixer.c

@@ -21 +21 @@
         udelay(10);
 #ifdef IO_DEBUG
-        snd_printk(KERN_DEBUG "mixer_write 0x%x 0x%x\n", reg, data);
+        dev_dbg(chip->card->dev, "mixer_write 0x%x 0x%x\n", reg, data);
 #endif
 }
@@ -34 +34 @@
         udelay(10);
 #ifdef IO_DEBUG
-        snd_printk(KERN_DEBUG "mixer_read 0x%x 0x%x\n", reg, result);
+        dev_dbg(chip->card->dev, "mixer_read 0x%x 0x%x\n", reg, result);
 #endif
         return result;