Merge tag 'v4.0' into for_next

[deliverable/linux.git] / sound / isa / opti9xx / miro.c

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index c2ca681ac51ba7516cf93834df76cf613a6eff2f..3a9067db1a842605518c70eabf84f5691413db00 100644 (file)
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -29,7 +29,7 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/dma.h>
 #include <sound/core.h>
 #include <sound/wss.h>
@@ -1270,8 +1270,6 @@ static int snd_miro_probe(struct snd_card *card)
        int error;
        struct snd_miro *miro = card->private_data;
        struct snd_wss *codec;
-       struct snd_timer *timer;
-       struct snd_pcm *pcm;
        struct snd_rawmidi *rmidi;
 
        if (!miro->res_mc_base) {
@@ -1310,7 +1308,7 @@ static int snd_miro_probe(struct snd_card *card)
        if (error < 0)
                return error;
 
-       error = snd_wss_pcm(codec, 0, &pcm);
+       error = snd_wss_pcm(codec, 0);
        if (error < 0)
                return error;
 
@@ -1318,11 +1316,11 @@ static int snd_miro_probe(struct snd_card *card)
        if (error < 0)
                return error;
 
-       error = snd_wss_timer(codec, 0, &timer);
+       error = snd_wss_timer(codec, 0);
        if (error < 0)
                return error;
 
-       miro->pcm = pcm;
+       miro->pcm = codec->pcm;
 
        error = snd_miro_mixer(card, miro);
        if (error < 0)
@@ -1356,8 +1354,8 @@ static int snd_miro_probe(struct snd_card *card)
 
        strcpy(card->driver, "miro");
        sprintf(card->longname, "%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&%d",
-               card->shortname, miro->name, pcm->name, miro->wss_base + 4,
-               miro->irq, miro->dma1, miro->dma2);
+               card->shortname, miro->name, codec->pcm->name,
+               miro->wss_base + 4, miro->irq, miro->dma1, miro->dma2);
 
        if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT)
                rmidi = NULL;