Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f33991d authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Takashi Iwai
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 15aded4c

sound/pci/sonicvibes.c

+2 −5
Original line number Diff line number Diff line
@@ -880,8 +880,7 @@ static struct snd_pcm_ops snd_sonicvibes_capture_ops = { 
	.pointer =	snd_sonicvibes_capture_pointer,

};



static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device,

			      struct snd_pcm **rpcm)

static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device)

{

	struct snd_pcm *pcm;

	int err;
@@ -902,8 +901,6 @@ static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device, 
	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      snd_dma_pci_data(sonic->pci), 64*1024, 128*1024);



	if (rpcm)

		*rpcm = pcm;

	return 0;

}
@@ -1491,7 +1488,7 @@ static int snd_sonic_probe(struct pci_dev *pci, 
		(unsigned long long)pci_resource_start(pci, 1),

		sonic->irq);



	if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {

	if ((err = snd_sonicvibes_pcm(sonic, 0)) < 0) {

		snd_card_free(card);

		return err;

	}