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

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

ALSA: gus: Remove always NULL parameters 



snd_gf1_pcm_new() and snd_gf1_rawmidi_new() take a pointer to a pointer of a
PCM/MIDI where if this parameter is provided the newly allocated object 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 1a2515ac

include/sound/gus.h

+2 −2
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus); 


/* gus_pcm.c */



int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, struct snd_pcm ** rpcm);

int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index);



#ifdef CONFIG_SND_DEBUG

extern void snd_gf1_print_voice_registers(struct snd_gus_card * gus);
@@ -620,7 +620,7 @@ void snd_gus_irq_profile_init(struct snd_gus_card *gus); 


/* gus_uart.c */



int snd_gf1_rawmidi_new(struct snd_gus_card * gus, int device, struct snd_rawmidi **rrawmidi);

int snd_gf1_rawmidi_new(struct snd_gus_card *gus, int device);



/* gus_dram.c */

int snd_gus_dram_write(struct snd_gus_card *gus, char __user *ptr,

sound/isa/gus/gus_pcm.c

+1 −5
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static struct snd_pcm_ops snd_gf1_pcm_capture_ops = { 
	.pointer =	snd_gf1_pcm_capture_pointer,

};



int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, struct snd_pcm ** rpcm)

int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index)

{

	struct snd_card *card;

	struct snd_kcontrol *kctl;
@@ -857,8 +857,6 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s 
	struct snd_pcm_substream *substream;

	int capture, err;



	if (rpcm)

		*rpcm = NULL;

	card = gus->card;

	capture = !gus->interwave && !gus->ess_flag && !gus->ace_flag ? 1 : 0;

	err = snd_pcm_new(card,
@@ -903,8 +901,6 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s 
		return err;

	kctl->id.index = control_index;



	if (rpcm)

		*rpcm = pcm;

	return 0;

}

sound/isa/gus/gus_uart.c

+1 −5
Original line number Diff line number Diff line
@@ -241,13 +241,11 @@ static struct snd_rawmidi_ops snd_gf1_uart_input = 
	.trigger =	snd_gf1_uart_input_trigger,

};



int snd_gf1_rawmidi_new(struct snd_gus_card * gus, int device, struct snd_rawmidi ** rrawmidi)

int snd_gf1_rawmidi_new(struct snd_gus_card *gus, int device)

{

	struct snd_rawmidi *rmidi;

	int err;



	if (rrawmidi)

		*rrawmidi = NULL;

	if ((err = snd_rawmidi_new(gus->card, "GF1", device, 1, 1, &rmidi)) < 0)

		return err;

	strcpy(rmidi->name, gus->interwave ? "AMD InterWave" : "GF1");
@@ -256,7 +254,5 @@ int snd_gf1_rawmidi_new(struct snd_gus_card * gus, int device, struct snd_rawmid 
	rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT | SNDRV_RAWMIDI_INFO_DUPLEX;

	rmidi->private_data = gus;

	gus->midi_uart = rmidi;

	if (rrawmidi)

		*rrawmidi = rmidi;

	return err;

}

sound/isa/gus/gusclassic.c

+2 −2
Original line number Diff line number Diff line
@@ -181,12 +181,12 @@ static int snd_gusclassic_probe(struct device *dev, unsigned int n) 
	if (error < 0)

		goto out;



	error = snd_gf1_pcm_new(gus, 0, 0, NULL);

	error = snd_gf1_pcm_new(gus, 0, 0);

	if (error < 0)

		goto out;



	if (!gus->ace_flag) {

		error = snd_gf1_rawmidi_new(gus, 0, NULL);

		error = snd_gf1_rawmidi_new(gus, 0);

		if (error < 0)

			goto out;

	}

sound/isa/gus/gusextreme.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int snd_gusextreme_probe(struct device *dev, unsigned int n) 
	snd_component_add(card, "ES1688");



	if (pcm_channels[n] > 0) {

		error = snd_gf1_pcm_new(gus, 1, 1, NULL);

		error = snd_gf1_pcm_new(gus, 1, 1);

		if (error < 0)

			goto out;

	}