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

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

ALSA: msnd: Remove always NULL parameter 



snd_msnd_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 db5abb3c

sound/isa/msnd/msnd.c

+1 −5
Original line number Diff line number Diff line
@@ -679,8 +679,7 @@ static struct snd_pcm_ops snd_msnd_capture_ops = { 
};





int snd_msnd_pcm(struct snd_card *card, int device,

			struct snd_pcm **rpcm)

int snd_msnd_pcm(struct snd_card *card, int device)

{

	struct snd_msnd *chip = card->private_data;

	struct snd_pcm	*pcm;
@@ -696,9 +695,6 @@ int snd_msnd_pcm(struct snd_card *card, int device, 
	pcm->private_data = chip;

	strcpy(pcm->name, "Hurricane");





	if (rpcm)

		*rpcm = pcm;

	return 0;

}

EXPORT_SYMBOL(snd_msnd_pcm);

sound/isa/msnd/msnd.h

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ int snd_msnd_disable_irq(struct snd_msnd *chip); 
void snd_msnd_dsp_halt(struct snd_msnd *chip, struct file *file);

int snd_msnd_DAPQ(struct snd_msnd *chip, int start);

int snd_msnd_DARQ(struct snd_msnd *chip, int start);

int snd_msnd_pcm(struct snd_card *card, int device, struct snd_pcm **rpcm);

int snd_msnd_pcm(struct snd_card *card, int device);



int snd_msndmidi_new(struct snd_card *card, int device);

void snd_msndmidi_input_read(void *mpu);

sound/isa/msnd/msnd_pinnacle.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static int snd_msnd_attach(struct snd_card *card) 
	if (err < 0)

		goto err_release_region;



	err = snd_msnd_pcm(card, 0, NULL);

	err = snd_msnd_pcm(card, 0);

	if (err < 0) {

		printk(KERN_ERR LOGNAME ": error creating new PCM device\n");

		goto err_release_region;