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

Commit 1a2515ac authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Takashi Iwai
Browse files

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

sound/isa/es18xx.c

+2 −8
Original line number Diff line number Diff line
@@ -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;