1 files changed, 75 insertions, 40 deletions

diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index cd408b86c839..d989215f3556 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -273,7 +273,8 @@ static inline void snd_sonicvibes_setdmaa(struct sonicvibes * sonic,
         outl(count, sonic->dmaa_port + SV_DMA_COUNT0);
         outb(0x18, sonic->dmaa_port + SV_DMA_MODE);
 #if 0
-        printk("program dmaa: addr = 0x%x, paddr = 0x%x\n", addr, inl(sonic->dmaa_port + SV_DMA_ADDR0));
+        printk(KERN_DEBUG "program dmaa: addr = 0x%x, paddr = 0x%x\n",
+               addr, inl(sonic->dmaa_port + SV_DMA_ADDR0));
 #endif
 }
 
@@ -288,7 +289,8 @@ static inline void snd_sonicvibes_setdmac(struct sonicvibes * sonic,
         outl(count, sonic->dmac_port + SV_DMA_COUNT0);
         outb(0x14, sonic->dmac_port + SV_DMA_MODE);
 #if 0
-        printk("program dmac: addr = 0x%x, paddr = 0x%x\n", addr, inl(sonic->dmac_port + SV_DMA_ADDR0));
+        printk(KERN_DEBUG "program dmac: addr = 0x%x, paddr = 0x%x\n",
+               addr, inl(sonic->dmac_port + SV_DMA_ADDR0));
 #endif
 }
 
@@ -355,71 +357,104 @@ static unsigned char snd_sonicvibes_in(struct sonicvibes * sonic, unsigned char
 #if 0
 static void snd_sonicvibes_debug(struct sonicvibes * sonic)
 {
-        printk("SV REGS:          INDEX = 0x%02x  ", inb(SV_REG(sonic, INDEX)));
+        printk(KERN_DEBUG
+               "SV REGS:          INDEX = 0x%02x  ", inb(SV_REG(sonic, INDEX)));
         printk("                 STATUS = 0x%02x\n", inb(SV_REG(sonic, STATUS)));
-        printk("  0x00: left input      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x00));
+        printk(KERN_DEBUG
+               "  0x00: left input      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x00));
         printk("  0x20: synth rate low  = 0x%02x\n", snd_sonicvibes_in(sonic, 0x20));
-        printk("  0x01: right input     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x01));
+        printk(KERN_DEBUG
+               "  0x01: right input     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x01));
         printk("  0x21: synth rate high = 0x%02x\n", snd_sonicvibes_in(sonic, 0x21));
-        printk("  0x02: left AUX1       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x02));
+        printk(KERN_DEBUG
+               "  0x02: left AUX1       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x02));
         printk("  0x22: ADC clock       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x22));
-        printk("  0x03: right AUX1      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x03));
+        printk(KERN_DEBUG
+               "  0x03: right AUX1      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x03));
         printk("  0x23: ADC alt rate    = 0x%02x\n", snd_sonicvibes_in(sonic, 0x23));
-        printk("  0x04: left CD         = 0x%02x  ", snd_sonicvibes_in(sonic, 0x04));
+        printk(KERN_DEBUG
+               "  0x04: left CD         = 0x%02x  ", snd_sonicvibes_in(sonic, 0x04));
         printk("  0x24: ADC pll M       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x24));
-        printk("  0x05: right CD        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x05));
+        printk(KERN_DEBUG
+               "  0x05: right CD        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x05));
         printk("  0x25: ADC pll N       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x25));
-        printk("  0x06: left line       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x06));
+        printk(KERN_DEBUG
+               "  0x06: left line       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x06));
         printk("  0x26: Synth pll M     = 0x%02x\n", snd_sonicvibes_in(sonic, 0x26));
-        printk("  0x07: right line      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x07));
+        printk(KERN_DEBUG
+               "  0x07: right line      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x07));
         printk("  0x27: Synth pll N     = 0x%02x\n", snd_sonicvibes_in(sonic, 0x27));
-        printk("  0x08: MIC             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x08));
+        printk(KERN_DEBUG
+               "  0x08: MIC             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x08));
         printk("  0x28: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x28));
-        printk("  0x09: Game port       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x09));
+        printk(KERN_DEBUG
+               "  0x09: Game port       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x09));
         printk("  0x29: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x29));
-        printk("  0x0a: left synth      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0a));
+        printk(KERN_DEBUG
+               "  0x0a: left synth      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0a));
         printk("  0x2a: MPU401          = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2a));
-        printk("  0x0b: right synth     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0b));
+        printk(KERN_DEBUG
+               "  0x0b: right synth     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0b));
         printk("  0x2b: drive ctrl      = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2b));
-        printk("  0x0c: left AUX2       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0c));
+        printk(KERN_DEBUG
+               "  0x0c: left AUX2       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0c));
         printk("  0x2c: SRS space       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2c));
-        printk("  0x0d: right AUX2      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0d));
+        printk(KERN_DEBUG
+               "  0x0d: right AUX2      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0d));
         printk("  0x2d: SRS center      = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2d));
-        printk("  0x0e: left analog     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0e));
+        printk(KERN_DEBUG
+               "  0x0e: left analog     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0e));
         printk("  0x2e: wave source     = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2e));
-        printk("  0x0f: right analog    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0f));
+        printk(KERN_DEBUG
+               "  0x0f: right analog    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0f));
         printk("  0x2f: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2f));
-        printk("  0x10: left PCM        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x10));
+        printk(KERN_DEBUG
+               "  0x10: left PCM        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x10));
         printk("  0x30: analog power    = 0x%02x\n", snd_sonicvibes_in(sonic, 0x30));
-        printk("  0x11: right PCM       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x11));
+        printk(KERN_DEBUG
+               "  0x11: right PCM       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x11));
         printk("  0x31: analog power    = 0x%02x\n", snd_sonicvibes_in(sonic, 0x31));
-        printk("  0x12: DMA data format = 0x%02x  ", snd_sonicvibes_in(sonic, 0x12));
+        printk(KERN_DEBUG
+               "  0x12: DMA data format = 0x%02x  ", snd_sonicvibes_in(sonic, 0x12));
         printk("  0x32: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x32));
-        printk("  0x13: P/C enable      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x13));
+        printk(KERN_DEBUG
+               "  0x13: P/C enable      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x13));
         printk("  0x33: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x33));
-        printk("  0x14: U/D button      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x14));
+        printk(KERN_DEBUG
+               "  0x14: U/D button      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x14));
         printk("  0x34: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x34));
-        printk("  0x15: revision        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x15));
+        printk(KERN_DEBUG
+               "  0x15: revision        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x15));
         printk("  0x35: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x35));
-        printk("  0x16: ADC output ctrl = 0x%02x  ", snd_sonicvibes_in(sonic, 0x16));
+        printk(KERN_DEBUG
+               "  0x16: ADC output ctrl = 0x%02x  ", snd_sonicvibes_in(sonic, 0x16));
         printk("  0x36: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x36));
-        printk("  0x17: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x17));
+        printk(KERN_DEBUG
+               "  0x17: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x17));
         printk("  0x37: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x37));
-        printk("  0x18: DMA A upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x18));
+        printk(KERN_DEBUG
+               "  0x18: DMA A upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x18));
         printk("  0x38: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x38));
-        printk("  0x19: DMA A lower cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x19));
+        printk(KERN_DEBUG
+               "  0x19: DMA A lower cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x19));
         printk("  0x39: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x39));
-        printk("  0x1a: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1a));
+        printk(KERN_DEBUG
+               "  0x1a: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1a));
         printk("  0x3a: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3a));
-        printk("  0x1b: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1b));
+        printk(KERN_DEBUG
+               "  0x1b: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1b));
         printk("  0x3b: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3b));
-        printk("  0x1c: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1c));
+        printk(KERN_DEBUG
+               "  0x1c: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1c));
         printk("  0x3c: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3c));
-        printk("  0x1d: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1d));
+        printk(KERN_DEBUG
+               "  0x1d: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1d));
         printk("  0x3d: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3d));
-        printk("  0x1e: PCM rate low    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1e));
+        printk(KERN_DEBUG
+               "  0x1e: PCM rate low    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1e));
         printk("  0x3e: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3e));
-        printk("  0x1f: PCM rate high   = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1f));
+        printk(KERN_DEBUG
+               "  0x1f: PCM rate high   = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1f));
         printk("  0x3f: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3f));
 }
 
@@ -476,8 +511,8 @@ static void snd_sonicvibes_pll(unsigned int rate,
         *res_m = m;
         *res_n = n;
 #if 0
-        printk("metric = %i, xm = %i, xn = %i\n", metric, xm, xn);
-        printk("pll: m = 0x%x, r = 0x%x, n = 0x%x\n", reg, m, r, n);
+        printk(KERN_DEBUG "metric = %i, xm = %i, xn = %i\n", metric, xm, xn);
+        printk(KERN_DEBUG "pll: m = 0x%x, r = 0x%x, n = 0x%x\n", reg, m, r, n);
 #endif
 }
 
@@ -1423,9 +1458,9 @@ static int __devinit snd_sonic_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
  
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         for (idx = 0; idx < 5; idx++) {
                 if (pci_resource_start(pci, idx) == 0 ||
                     !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) {