Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / sound / isa / sscape.c

diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 44405df7d4becffcf82db3b5e9a1152f65eed304..7b248cdf06e2166d82dfc69ea318247fc8eca6f7 100644 (file)
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -23,6 +23,7 @@
 
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/io.h>
 #include <linux/isa.h>
 #include <linux/delay.h>
 #include <linux/firmware.h>
@@ -877,7 +878,6 @@ static int create_ad1845(struct snd_card *card, unsigned port,
                             codec_type, WSS_HWSHARE_DMA1, &chip);
        if (!err) {
                unsigned long flags;
-               struct snd_pcm *pcm;
 
                if (sscape->type != SSCAPE_VIVO) {
                        /*
@@ -893,7 +893,7 @@ static int create_ad1845(struct snd_card *card, unsigned port,
 
                }
 
-               err = snd_wss_pcm(chip, 0, &pcm);
+               err = snd_wss_pcm(chip, 0);
                if (err < 0) {
                        snd_printk(KERN_ERR "sscape: No PCM device "
                                            "for AD1845 chip\n");
@@ -907,7 +907,7 @@ static int create_ad1845(struct snd_card *card, unsigned port,
                        goto _error;
                }
                if (chip->hardware != WSS_HW_AD1848) {
-                       err = snd_wss_timer(chip, 0, NULL);
+                       err = snd_wss_timer(chip, 0);
                        if (err < 0) {
                                snd_printk(KERN_ERR "sscape: No timer device "
                                                    "for AD1845 chip\n");