Changeset 426 for GPL/trunk/alsa-kernel/pci/es1938.c

Timestamp:

May 9, 2009, 11:45:26 AM (16 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

File:

• GPL/trunk/alsa-kernel/pci/es1938.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/es1938.c

@@ -1609 +1609 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
                 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
@@ -1674 +1674 @@
         status = inb(SLIO_REG(chip, IRQCONTROL));
 #if 0
-        printk("Es1938debug - interrupt status: =0x%x\n", status);
+        printk(KERN_DEBUG "Es1938debug - interrupt status: =0x%x\n", status);
 #endif
         
@@ -1680 +1680 @@
         if (status & 0x10) {
 #if 0
-                printk("Es1938debug - AUDIO channel 1 interrupt\n");
-                printk("Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 interrupt\n");
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n",
                        inw(SLDM_REG(chip, DMACOUNT)));
-                printk("Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n",
                        inl(SLDM_REG(chip, DMAADDR)));
-                printk("Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n",
                        inl(SLDM_REG(chip, DMASTATUS)));
 #endif
@@ -1700 +1704 @@
         if (status & 0x20) {
 #if 0
-                printk("Es1938debug - AUDIO channel 2 interrupt\n");
-                printk("Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 2 interrupt\n");
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n",
                        inw(SLIO_REG(chip, AUDIO2DMACOUNT)));
-                printk("Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n",
                        inl(SLIO_REG(chip, AUDIO2DMAADDR)));