ALSA: wss: Remove (almost) always NULL parameters

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

diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index 7dba07a4343aecfbebbb2c97c43e47b87936e768..282cd75d2235659729e58e558e2872bbfbb3f20d 100644 (file)
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -92,7 +92,6 @@ static int snd_cs4231_probe(struct device *dev, unsigned int n)
 {
        struct snd_card *card;
        struct snd_wss *chip;
-       struct snd_pcm *pcm;
        int error;
 
        error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
@@ -106,15 +105,15 @@ static int snd_cs4231_probe(struct device *dev, unsigned int n)
 
        card->private_data = chip;
 
-       error = snd_wss_pcm(chip, 0, &pcm);
+       error = snd_wss_pcm(chip, 0);
        if (error < 0)
                goto out;
 
        strcpy(card->driver, "CS4231");
-       strcpy(card->shortname, pcm->name);
+       strcpy(card->shortname, chip->pcm->name);
 
        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
-               pcm->name, chip->port, irq[n], dma1[n]);
+               chip->pcm->name, chip->port, irq[n], dma1[n]);
        if (dma2[n] >= 0)
                sprintf(card->longname + strlen(card->longname), "&%d", dma2[n]);
 
@@ -122,7 +121,7 @@ static int snd_cs4231_probe(struct device *dev, unsigned int n)
        if (error < 0)
                goto out;
 
-       error = snd_wss_timer(chip, 0, NULL);
+       error = snd_wss_timer(chip, 0);
        if (error < 0)
                goto out;