diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2015-01-02 12:24:52 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2015-01-02 16:33:36 +0100 |
| commit | 15aded4c924ae149a38e639f421f5313125eea89 (patch) | |
| tree | 7dcc0e2df907f1f1b56ef12431690a55975acbaa /sound/pci/riptide | |
| parent | ALSA: ice1712: Remove always NULL parameters (diff) | |
| download | linux-dev-15aded4c924ae149a38e639f421f5313125eea89.tar.xz linux-dev-15aded4c924ae149a38e639f421f5313125eea89.zip | |
ALSA: riptide: Remove always NULL parameter
snd_riptide_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/pci/riptide')
| -rw-r--r-- | sound/pci/riptide/riptide.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 6abc2ac8fffb..121f2c09d7a7 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1706,14 +1706,11 @@ static struct snd_pcm_ops snd_riptide_capture_ops = { .pointer = snd_riptide_pointer, }; -static int -snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm) +static int snd_riptide_pcm(struct snd_riptide *chip, int device) { struct snd_pcm *pcm; int err; - if (rpcm) - *rpcm = NULL; if ((err = snd_pcm_new(chip->card, "RIPTIDE", device, PLAYBACK_SUBSTREAMS, 1, &pcm)) < 0) @@ -1729,8 +1726,6 @@ snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm) snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(chip->pci), 64 * 1024, 128 * 1024); - if (rpcm) - *rpcm = pcm; return 0; } @@ -2092,7 +2087,7 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) if (err < 0) goto error; card->private_data = chip; - err = snd_riptide_pcm(chip, 0, NULL); + err = snd_riptide_pcm(chip, 0); if (err < 0) goto error; err = snd_riptide_mixer(chip); |