10 files changed, 31 insertions, 42 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 6b26305ff0e6..2f8f295d6b0c 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -698,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);
@@ -708,7 +708,6 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
         mtp_card->card = card;
         mtp_card->irq = -1;
         mtp_card->share_irq = 0;
-        mtp_card->inmidiport = 0xffffffff;
         mtp_card->inmidistate = 0;
         mtp_card->outmidihwport = 0xffffffff;
         init_timer(&mtp_card->timer);
@@ -721,6 +720,8 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
         if (err < 0)
                 goto __error;
 
+        mtp_card->inmidiport = mtp_card->num_ports + MTPAV_PIDX_BROADCAST;
+
         err = snd_mtpav_get_ISA(mtp_card);
         if (err < 0)
                 goto __error;
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 1a05b2d64c9b..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);
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index c7c744c6fc0b..b60cef257b58 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -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 ff0a41510945..b2b6d50c9425 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -942,9 +942,9 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)
                 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 1022e365606f..0e631c3221e3 100644
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -90,10 +90,10 @@ 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;
 
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;