diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-02 12:24:38 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-02 16:27:24 +0100 |
| commit | 1a2515ac94bbb1c409dea2e4a7b011592569b239 (patch) | |
| tree | f20dc74a27038284bcd6d0e4724030cd5cf6d218 /sound/isa | |
| parent | 4b8ab88518726197c8659bc9aca96c6af01dab57 (diff) | |
| download | op-kernel-dev-1a2515ac94bbb1c409dea2e4a7b011592569b239.zip op-kernel-dev-1a2515ac94bbb1c409dea2e4a7b011592569b239.tar.gz | |
ALSA: es18xx: Remove always NULL parameter
snd_es18xx_pcm() takes a pointer to a pointer of a PCM where if this
parameter is provided the newly allocated PCM is stored. All callers pass
NULL though, so remove the parameter. This makes the code a bit cleaner and
shorter.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/es18xx.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index b481bb8..6cc2d2b 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -1687,16 +1687,13 @@ static struct snd_pcm_ops snd_es18xx_capture_ops = { .pointer = snd_es18xx_capture_pointer, }; -static int snd_es18xx_pcm(struct snd_card *card, int device, - struct snd_pcm **rpcm) +static int snd_es18xx_pcm(struct snd_card *card, int device) { struct snd_es18xx *chip = card->private_data; struct snd_pcm *pcm; char str[16]; int err; - if (rpcm) - *rpcm = NULL; sprintf(str, "ES%x", chip->version); if (chip->caps & ES18XX_PCM2) err = snd_pcm_new(card, str, device, 2, 1, &pcm); @@ -1722,9 +1719,6 @@ static int snd_es18xx_pcm(struct snd_card *card, int device, snd_dma_isa_data(), 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024); - - if (rpcm) - *rpcm = pcm; return 0; } @@ -2154,7 +2148,7 @@ static int snd_audiodrive_probe(struct snd_card *card, int dev) chip->port, irq[dev], dma1[dev]); - err = snd_es18xx_pcm(card, 0, NULL); + err = snd_es18xx_pcm(card, 0); if (err < 0) return err; |
