ASoC: sb16: Simplify snd_sb16dsp_pcm()

All callers of snd_sb16dsp_pcm() always pass the pcm field of the first
parameter as the last parameter. Simplify the function by moving this inside
the function itself. This makes the code a bit shorter and cleaner.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

3 files changed, 4 insertions, 8 deletions

diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index 32d01525211d..bc9ea306ee02 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -233,7 +233,7 @@ static int snd_card_als100_probe(int dev,
                         irq[dev], dma8[dev], dma16[dev]);
         }
 
-        if ((error = snd_sb16dsp_pcm(chip, 0, &chip->pcm)) < 0) {
+        if ((error = snd_sb16dsp_pcm(chip, 0)) < 0) {
                 snd_card_free(card);
                 return error;
         }
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 3f694543a7ea..4a7d7c89808f 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -374,7 +374,7 @@ static int snd_sb16_probe(struct snd_card *card, int dev)
         if (! is_isapnp_selected(dev) && (err = snd_sb16dsp_configure(chip)) < 0)
                 return err;
 
-        if ((err = snd_sb16dsp_pcm(chip, 0, &chip->pcm)) < 0)
+        if ((err = snd_sb16dsp_pcm(chip, 0)) < 0)
                 return err;
 
         strcpy(card->driver,
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index 72b10f4f3e70..63d11b7b9fe8 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -860,19 +860,18 @@ static struct snd_pcm_ops snd_sb16_capture_ops = {
         .pointer =      snd_sb16_capture_pointer,
 };
 
-int snd_sb16dsp_pcm(struct snd_sb * chip, int device, struct snd_pcm ** rpcm)
+int snd_sb16dsp_pcm(struct snd_sb *chip, int device)
 {
         struct snd_card *card = chip->card;
         struct snd_pcm *pcm;
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
         if ((err = snd_pcm_new(card, "SB16 DSP", device, 1, 1, &pcm)) < 0)
                 return err;
         sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff);
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
         pcm->private_data = chip;
+        chip->pcm = pcm;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops);
@@ -885,9 +884,6 @@ int snd_sb16dsp_pcm(struct snd_sb * chip, int device, struct snd_pcm ** rpcm)
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
                                               snd_dma_isa_data(),
                                               64*1024, 128*1024);
-
-        if (rpcm)
-                *rpcm = pcm;
         return 0;
 }