aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-01-02 06:24:53 -0500
committerTakashi Iwai <tiwai@suse.de>2015-01-02 10:33:52 -0500
commit0f33991dd2811cb5458b1a2bc19c6aa6ff64c00b (patch)
tree8604e136d6ee20f74c8e09d0563bee03b8f37d7c /sound/pci
parent15aded4c924ae149a38e639f421f5313125eea89 (diff)
ALSA: sonicvibes: Remove always NULL parameter
snd_sonicvibes_pcm() take 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')
-rw-r--r--sound/pci/sonicvibes.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 313a7328bf9c..34cee5c1abd8 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -880,8 +880,7 @@ static struct snd_pcm_ops snd_sonicvibes_capture_ops = {
880 .pointer = snd_sonicvibes_capture_pointer, 880 .pointer = snd_sonicvibes_capture_pointer,
881}; 881};
882 882
883static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device, 883static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device)
884 struct snd_pcm **rpcm)
885{ 884{
886 struct snd_pcm *pcm; 885 struct snd_pcm *pcm;
887 int err; 886 int err;
@@ -902,8 +901,6 @@ static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device,
902 snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, 901 snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
903 snd_dma_pci_data(sonic->pci), 64*1024, 128*1024); 902 snd_dma_pci_data(sonic->pci), 64*1024, 128*1024);
904 903
905 if (rpcm)
906 *rpcm = pcm;
907 return 0; 904 return 0;
908} 905}
909 906
@@ -1491,7 +1488,7 @@ static int snd_sonic_probe(struct pci_dev *pci,
1491 (unsigned long long)pci_resource_start(pci, 1), 1488 (unsigned long long)pci_resource_start(pci, 1),
1492 sonic->irq); 1489 sonic->irq);
1493 1490
1494 if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) { 1491 if ((err = snd_sonicvibes_pcm(sonic, 0)) < 0) {
1495 snd_card_free(card); 1492 snd_card_free(card);
1496 return err; 1493 return err;
1497 } 1494 }