16 files changed, 78 insertions, 77 deletions

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 73be7e14a603..54239d2e0997 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -588,10 +588,10 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
         int idx, err;
         int dev = devptr->id;
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_dummy));
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_dummy), &card);
+        if (err < 0)
+                return err;
         dummy = card->private_data;
         dummy->card = card;
         for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) {
diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c
index 7783843ca9ae..1950ffce2b54 100644
--- a/sound/drivers/ml403-ac97cr.c
+++ b/sound/drivers/ml403-ac97cr.c
@@ -1279,9 +1279,9 @@ static int __devinit snd_ml403_ac97cr_probe(struct platform_device *pfdev)
         if (!enable[dev])
                 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;
         err = snd_ml403_ac97cr_create(card, pfdev, &ml403_ac97cr);
         if (err < 0) {
                 PDEBUG(INIT_FAILURE, "probe(): create failed!\n");
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 5b996f3faba5..149d05a8202d 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -73,9 +73,9 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
                 snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");
 
         *rcard = NULL;
-        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;
         strcpy(card->driver, "MPU-401 UART");
         strcpy(card->shortname, card->driver);
         sprintf(card->longname, "%s at %#lx, ", card->shortname, port[dev]);
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 48b64e6b2670..2f8f295d6b0c 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -303,8 +303,10 @@ static void snd_mtpav_output_port_write(struct mtpav *mtp_card,
 
                 snd_mtpav_send_byte(mtp_card, 0xf5);
                 snd_mtpav_send_byte(mtp_card, portp->hwport);
-                //snd_printk("new outport: 0x%x\n", (unsigned int) portp->hwport);
-
+                /*
+                snd_printk(KERN_DEBUG "new outport: 0x%x\n",
+                           (unsigned int) portp->hwport);
+                */
                 if (!(outbyte & 0x80) && portp->running_status)
                         snd_mtpav_send_byte(mtp_card, portp->running_status);
         }
@@ -540,7 +542,7 @@ static void snd_mtpav_read_bytes(struct mtpav *mcrd)
 
         u8 sbyt = snd_mtpav_getreg(mcrd, SREG);
 
-        //printk("snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt);
+        /* printk(KERN_DEBUG "snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); */
 
         if (!(sbyt & SIGS_BYTE))
                 return;
@@ -585,12 +587,12 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)
 static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
 {
         if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
-                snd_printk("MTVAP port 0x%lx is busy\n", port);
+                snd_printk(KERN_ERR "MTVAP port 0x%lx is busy\n", port);
                 return -EBUSY;
         }
         mcard->port = port;
         if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
-                snd_printk("MTVAP IRQ %d busy\n", irq);
+                snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
                 return -EBUSY;
         }
         mcard->irq = irq;
@@ -696,9 +698,9 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
         int err;
         struct mtpav *mtp_card;
 
-        card = snd_card_new(index, id, THIS_MODULE, sizeof(*mtp_card));
-        if (! card)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card);
+        if (err < 0)
+                return err;
 
         mtp_card = card->private_data;
         spin_lock_init(&mtp_card->spinlock);
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 87ba1ddc0115..9284829bf927 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -957,10 +957,10 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)
         if ((err = snd_mts64_probe_port(p)) < 0)
                 return err;
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL) {
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0) {
                 snd_printd("Cannot create card\n");
-                return -ENOMEM;
+                return err;
         }
         strcpy(card->driver, DRIVER_NAME);
         strcpy(card->shortname, "ESI " CARD_NAME);
@@ -1015,7 +1015,7 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)
                 goto __err;
         }
 
-        snd_printk("ESI Miditerminal 4140 on 0x%lx\n", p->base);
+        snd_printk(KERN_INFO "ESI Miditerminal 4140 on 0x%lx\n", p->base);
         return 0;
 
 __err:
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index 780582340fef..6e31e46ca393 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -302,7 +302,7 @@ void snd_opl3_interrupt(struct snd_hwdep * hw)
         opl3 = hw->private_data;
         status = inb(opl3->l_port);
 #if 0
-        snd_printk("AdLib IRQ status = 0x%x\n", status);
+        snd_printk(KERN_DEBUG "AdLib IRQ status = 0x%x\n", status);
 #endif
         if (!(status & 0x80))
                 return;
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index 16feafa2c51e..6e7d09ae0e82 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -125,7 +125,7 @@ static void debug_alloc(struct snd_opl3 *opl3, char *s, int voice) {
         int i;
         char *str = "x.24";
 
-        printk("time %.5i: %s [%.2i]: ", opl3->use_time, s, voice);
+        printk(KERN_DEBUG "time %.5i: %s [%.2i]: ", opl3->use_time, s, voice);
         for (i = 0; i < opl3->max_voices; i++)
                 printk("%c", *(str + opl3->voices[i].state + 1));
         printk("\n");
@@ -218,7 +218,7 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op,
         for (i = 0; i < END; i++) {
                 if (best[i].voice >= 0) {
 #ifdef DEBUG_ALLOC
-                        printk("%s %iop allocation on voice %i\n",
+                        printk(KERN_DEBUG "%s %iop allocation on voice %i\n",
                                alloc_type[i], instr_4op ? 4 : 2,
                                best[i].voice);
 #endif
@@ -317,7 +317,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
         opl3 = p;
 
 #ifdef DEBUG_MIDI
-        snd_printk("Note on, ch %i, inst %i, note %i, vel %i\n",
+        snd_printk(KERN_DEBUG "Note on, ch %i, inst %i, note %i, vel %i\n",
                    chan->number, chan->midi_program, note, vel);
 #endif
 
@@ -372,7 +372,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
                 return;
         }
 #ifdef DEBUG_MIDI
-        snd_printk("  --> OPL%i instrument: %s\n",
+        snd_printk(KERN_DEBUG "  --> OPL%i instrument: %s\n",
                    instr_4op ? 3 : 2, patch->name);
 #endif
         /* in SYNTH mode, application takes care of voices */
@@ -431,7 +431,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
         }
 
 #ifdef DEBUG_MIDI
-        snd_printk("  --> setting OPL3 connection: 0x%x\n",
+        snd_printk(KERN_DEBUG "  --> setting OPL3 connection: 0x%x\n",
                    opl3->connection_reg);
 #endif
         /*
@@ -466,7 +466,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
         /* Program the FM voice characteristics */
         for (i = 0; i < (instr_4op ? 4 : 2); i++) {
 #ifdef DEBUG_MIDI
-                snd_printk("  --> programming operator %i\n", i);
+                snd_printk(KERN_DEBUG "  --> programming operator %i\n", i);
 #endif
                 op_offset = snd_opl3_regmap[voice_offset][i];
 
@@ -546,7 +546,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
         blocknum |= OPL3_KEYON_BIT;
 
 #ifdef DEBUG_MIDI
-        snd_printk("  --> trigger voice %i\n", voice);
+        snd_printk(KERN_DEBUG "  --> trigger voice %i\n", voice);
 #endif
         /* Set OPL3 KEYON_BLOCK register of requested voice */ 
         opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset);
@@ -602,7 +602,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
                         prg = extra_prg - 1;
                 }
 #ifdef DEBUG_MIDI
-                snd_printk(" *** allocating extra program\n");
+                snd_printk(KERN_DEBUG " *** allocating extra program\n");
 #endif
                 goto __extra_prg;
         }
@@ -633,7 +633,7 @@ static void snd_opl3_kill_voice(struct snd_opl3 *opl3, int voice)
 
         /* kill voice */
 #ifdef DEBUG_MIDI
-        snd_printk("  --> kill voice %i\n", voice);
+        snd_printk(KERN_DEBUG "  --> kill voice %i\n", voice);
 #endif
         opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset);
         /* clear Key ON bit */
@@ -670,7 +670,7 @@ void snd_opl3_note_off(void *p, int note, int vel, struct snd_midi_channel *chan
         opl3 = p;
 
 #ifdef DEBUG_MIDI
-        snd_printk("Note off, ch %i, inst %i, note %i\n",
+        snd_printk(KERN_DEBUG "Note off, ch %i, inst %i, note %i\n",
                    chan->number, chan->midi_program, note);
 #endif
 
@@ -709,7 +709,7 @@ void snd_opl3_key_press(void *p, int note, int vel, struct snd_midi_channel *cha
 
         opl3 = p;
 #ifdef DEBUG_MIDI
-        snd_printk("Key pressure, ch#: %i, inst#: %i\n",
+        snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n",
                    chan->number, chan->midi_program);
 #endif
 }
@@ -723,7 +723,7 @@ void snd_opl3_terminate_note(void *p, int note, struct snd_midi_channel *chan)
 
         opl3 = p;
 #ifdef DEBUG_MIDI
-        snd_printk("Terminate note, ch#: %i, inst#: %i\n",
+        snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n",
                    chan->number, chan->midi_program);
 #endif
 }
@@ -812,7 +812,7 @@ void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan)
 
         opl3 = p;
 #ifdef DEBUG_MIDI
-        snd_printk("Controller, TYPE = %i, ch#: %i, inst#: %i\n",
+        snd_printk(KERN_DEBUG "Controller, TYPE = %i, ch#: %i, inst#: %i\n",
                    type, chan->number, chan->midi_program);
 #endif
 
@@ -849,7 +849,7 @@ void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan,
 
         opl3 = p;
 #ifdef DEBUG_MIDI
-        snd_printk("NRPN, ch#: %i, inst#: %i\n",
+        snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n",
                    chan->number, chan->midi_program);
 #endif
 }
@@ -864,6 +864,6 @@ void snd_opl3_sysex(void *p, unsigned char *buf, int len,
 
         opl3 = p;
 #ifdef DEBUG_MIDI
-        snd_printk("SYSEX\n");
+        snd_printk(KERN_DEBUG "SYSEX\n");
 #endif
 }
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c
index 9a2271dc046a..a54b1dc5cc78 100644
--- a/sound/drivers/opl3/opl3_oss.c
+++ b/sound/drivers/opl3/opl3_oss.c
@@ -220,14 +220,14 @@ static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format,
                 return -EINVAL;
 
         if (count < (int)sizeof(sbi)) {
-                snd_printk("FM Error: Patch record too short\n");
+                snd_printk(KERN_ERR "FM Error: Patch record too short\n");
                 return -EINVAL;
         }
         if (copy_from_user(&sbi, buf, sizeof(sbi)))
                 return -EFAULT;
 
         if (sbi.channel < 0 || sbi.channel >= SBFM_MAXINSTR) {
-                snd_printk("FM Error: Invalid instrument number %d\n",
+                snd_printk(KERN_ERR "FM Error: Invalid instrument number %d\n",
                            sbi.channel);
                 return -EINVAL;
         }
@@ -254,7 +254,9 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,
         opl3 = arg->private_data;
         switch (cmd) {
                 case SNDCTL_FM_LOAD_INSTR:
-                        snd_printk("OPL3: Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. Fix the program.\n");
+                        snd_printk(KERN_ERR "OPL3: "
+                                   "Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. "
+                                   "Fix the program.\n");
                         return -EINVAL;
 
                 case SNDCTL_SYNTH_MEMAVL:
diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c
index 962bb9c8b9c8..6d57b6441dec 100644
--- a/sound/drivers/opl3/opl3_synth.c
+++ b/sound/drivers/opl3/opl3_synth.c
@@ -168,7 +168,7 @@ int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file,
 
 #ifdef CONFIG_SND_DEBUG
         default:
-                snd_printk("unknown IOCTL: 0x%x\n", cmd);
+                snd_printk(KERN_WARNING "unknown IOCTL: 0x%x\n", cmd);
 #endif
         }
         return -ENOTTY;
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index a4049eb94d35..b60cef257b58 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -57,7 +57,7 @@ static int __devinit snd_pcsp_create(struct snd_card *card)
         else
                 min_div = MAX_DIV;
 #if PCSP_DEBUG
-        printk("PCSP: lpj=%li, min_div=%i, res=%li\n",
+        printk(KERN_DEBUG "PCSP: lpj=%li, min_div=%i, res=%li\n",
                loops_per_jiffy, min_div, tp.tv_nsec);
 #endif
 
@@ -98,9 +98,9 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
         hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
         pcsp_chip.timer.function = pcsp_do_timer;
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (!card)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         err = snd_pcsp_create(card);
         if (err < 0) {
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index b1c047ec19af..60158e2e0eaf 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -746,10 +746,10 @@ static int __devinit snd_portman_probe(struct platform_device *pdev)
         if ((err = snd_portman_probe_port(p)) < 0)
                 return err;
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL) {
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0) {
                 snd_printd("Cannot create card\n");
-                return -ENOMEM;
+                return err;
         }
         strcpy(card->driver, DRIVER_NAME);
         strcpy(card->shortname, CARD_NAME);
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index d8aab9da97c2..b2b6d50c9425 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -241,7 +241,8 @@ static void snd_uart16550_io_loop(struct snd_uart16550 * uart)
                         snd_rawmidi_receive(uart->midi_input[substream], &c, 1);
 
                 if (status & UART_LSR_OE)
-                        snd_printk("%s: Overrun on device at 0x%lx\n",
+                        snd_printk(KERN_WARNING
+                                   "%s: Overrun on device at 0x%lx\n",
                                uart->rmidi->name, uart->base);
         }
 
@@ -636,7 +637,8 @@ static int snd_uart16550_output_byte(struct snd_uart16550 *uart,
                 }
         } else {
                 if (!snd_uart16550_write_buffer(uart, midi_byte)) {
-                        snd_printk("%s: Buffer overrun on device at 0x%lx\n",
+                        snd_printk(KERN_WARNING
+                                   "%s: Buffer overrun on device at 0x%lx\n",
                                    uart->rmidi->name, uart->base);
                         return 0;
                 }
@@ -815,7 +817,8 @@ static int __devinit snd_uart16550_create(struct snd_card *card,
         if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
                 if (request_irq(irq, snd_uart16550_interrupt,
                                 IRQF_DISABLED, "Serial MIDI", uart)) {
-                        snd_printk("irq %d busy. Using Polling.\n", irq);
+                        snd_printk(KERN_WARNING
+                                   "irq %d busy. Using Polling.\n", irq);
                 } else {
                         uart->irq = irq;
                 }
@@ -919,26 +922,29 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)
         case SNDRV_SERIAL_GENERIC:
                 break;
         default:
-                snd_printk("Adaptor type is out of range 0-%d (%d)\n",
+                snd_printk(KERN_ERR
+                           "Adaptor type is out of range 0-%d (%d)\n",
                            SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);
                 return -ENODEV;
         }
 
         if (outs[dev] < 1 || outs[dev] > SNDRV_SERIAL_MAX_OUTS) {
-                snd_printk("Count of outputs is out of range 1-%d (%d)\n",
+                snd_printk(KERN_ERR
+                           "Count of outputs is out of range 1-%d (%d)\n",
                            SNDRV_SERIAL_MAX_OUTS, outs[dev]);
                 return -ENODEV;
         }
 
         if (ins[dev] < 1 || ins[dev] > SNDRV_SERIAL_MAX_INS) {
-                snd_printk("Count of inputs is out of range 1-%d (%d)\n",
+                snd_printk(KERN_ERR
+                           "Count of inputs is out of range 1-%d (%d)\n",
                            SNDRV_SERIAL_MAX_INS, ins[dev]);
                 return -ENODEV;
         }
 
-        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;
 
         strcpy(card->driver, "Serial");
         strcpy(card->shortname, "Serial MIDI (UART16550A)");
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index f79e3614079d..0e631c3221e3 100644
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -90,15 +90,17 @@ static int __devinit snd_virmidi_probe(struct platform_device *devptr)
         int idx, err;
         int dev = devptr->id;
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_card_virmidi));
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_card_virmidi), &card);
+        if (err < 0)
+                return err;
         vmidi = (struct snd_card_virmidi *)card->private_data;
         vmidi->card = card;
 
         if (midi_devs[dev] > MAX_MIDI_DEVICES) {
-                snd_printk("too much midi devices for virmidi %d: force to use %d\n", dev, MAX_MIDI_DEVICES);
+                snd_printk(KERN_WARNING
+                           "too much midi devices for virmidi %d: "
+                           "force to use %d\n", dev, MAX_MIDI_DEVICES);
                 midi_devs[dev] = MAX_MIDI_DEVICES;
         }
         for (idx = 0; idx < midi_devs[dev]; idx++) {
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index 14e3354be43a..19c6e376c7c7 100644
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -688,7 +688,8 @@ int snd_vx_dsp_load(struct vx_core *chip, const struct firmware *dsp)
                 image = dsp->data + i;
                 /* Wait DSP ready for a new read */
                 if ((err = vx_wait_isr_bit(chip, ISR_TX_EMPTY)) < 0) {
-                        printk("dsp loading error at position %d\n", i);
+                        printk(KERN_ERR
+                               "dsp loading error at position %d\n", i);
                         return err;
                 }
                 cptr = image;
diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c
index 8d6362e2d4c9..46df8817c18f 100644
--- a/sound/drivers/vx/vx_hwdep.c
+++ b/sound/drivers/vx/vx_hwdep.c
@@ -119,16 +119,6 @@ void snd_vx_free_firmware(struct vx_core *chip)
 
 #else /* old style firmware loading */
 
-static int vx_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
-static int vx_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
 static int vx_hwdep_dsp_status(struct snd_hwdep *hw,
                                struct snd_hwdep_dsp_status *info)
 {
@@ -243,8 +233,6 @@ int snd_vx_setup_firmware(struct vx_core *chip)
 
         hw->iface = SNDRV_HWDEP_IFACE_VX;
         hw->private_data = chip;
-        hw->ops.open = vx_hwdep_open;
-        hw->ops.release = vx_hwdep_release;
         hw->ops.dsp_status = vx_hwdep_dsp_status;
         hw->ops.dsp_load = vx_hwdep_dsp_load;
         hw->exclusive = 1;
diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c
index 0e1ba9b47904..b0560fec6bba 100644
--- a/sound/drivers/vx/vx_uer.c
+++ b/sound/drivers/vx/vx_uer.c
@@ -103,7 +103,7 @@ static void vx_write_one_cbit(struct vx_core *chip, int index, int val)
  * returns the frequency of UER, or 0 if not sync,
  * or a negative error code.
  */
-static int vx_read_uer_status(struct vx_core *chip, int *mode)
+static int vx_read_uer_status(struct vx_core *chip, unsigned int *mode)
 {
         int val, freq;