Commit 310efd3a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: gus: Fix assignment in if condition 

ISA GUS driver code contains lots of assignments in if condition,
which is a bad coding style that may confuse readers and occasionally
lead to bugs.

This patch is merely for coding-style fixes, no functional changes.

Link: https://lore.kernel.org/r/20210608140540.17885-5-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c305366a

sound/isa/gus/gus_main.c

+12 −6
Original line number Diff line number Diff line
@@ -165,12 +165,14 @@ int snd_gus_create(struct snd_card *card, 
	gus->gf1.reg_timerctrl = GUSP(gus, TIMERCNTRL);

	gus->gf1.reg_timerdata = GUSP(gus, TIMERDATA);

	/* allocate resources */

	if ((gus->gf1.res_port1 = request_region(port, 16, "GUS GF1 (Adlib/SB)")) == NULL) {

	gus->gf1.res_port1 = request_region(port, 16, "GUS GF1 (Adlib/SB)");

	if (!gus->gf1.res_port1) {

		snd_printk(KERN_ERR "gus: can't grab SB port 0x%lx\n", port);

		snd_gus_free(gus);

		return -EBUSY;

	}

	if ((gus->gf1.res_port2 = request_region(port + 0x100, 12, "GUS GF1 (Synth)")) == NULL) {

	gus->gf1.res_port2 = request_region(port + 0x100, 12, "GUS GF1 (Synth)");

	if (!gus->gf1.res_port2) {

		snd_printk(KERN_ERR "gus: can't grab synth port 0x%lx\n", port + 0x100);

		snd_gus_free(gus);

		return -EBUSY;
@@ -215,7 +217,8 @@ int snd_gus_create(struct snd_card *card, 
	gus->gf1.pcm_channels = pcm_channels;

	gus->gf1.volume_ramp = 25;

	gus->gf1.smooth_pan = 1;

	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops)) < 0) {

	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops);

	if (err < 0) {

		snd_gus_free(gus);

		return err;

	}
@@ -404,14 +407,17 @@ int snd_gus_initialize(struct snd_gus_card *gus) 
	int err;



	if (!gus->interwave) {

		if ((err = snd_gus_check_version(gus)) < 0) {

		err = snd_gus_check_version(gus);

		if (err < 0) {

			snd_printk(KERN_ERR "version check failed\n");

			return err;

		}

		if ((err = snd_gus_detect_memory(gus)) < 0)

		err = snd_gus_detect_memory(gus);

		if (err < 0)

			return err;

	}

	if ((err = snd_gus_init_dma_irq(gus, 1)) < 0)

	err = snd_gus_init_dma_irq(gus, 1);

	if (err < 0)

		return err;

	snd_gf1_start(gus);

	gus->initialized = 1;

sound/isa/gus/gus_mem.c

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ int snd_gf1_mem_free(struct snd_gf1_mem * alloc, unsigned int address) 
	struct snd_gf1_mem_block *block;



	snd_gf1_mem_lock(alloc, 0);

	if ((block = snd_gf1_mem_look(alloc, address)) != NULL) {

	block = snd_gf1_mem_look(alloc, address);

	if (block) {

		result = snd_gf1_mem_xfree(alloc, block);

		snd_gf1_mem_lock(alloc, 1);

		return result;

sound/isa/gus/gus_mixer.c

+4 −2
Original line number Diff line number Diff line
@@ -162,12 +162,14 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus) 
	if (!gus->ics_flag) {

		max = gus->ess_flag ? 1 : ARRAY_SIZE(snd_gf1_controls);

		for (idx = 0; idx < max; idx++) {

			if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_gf1_controls[idx], gus))) < 0)

			err = snd_ctl_add(card, snd_ctl_new1(&snd_gf1_controls[idx], gus));

			if (err < 0)

				return err;

		}

	} else {

		for (idx = 0; idx < ARRAY_SIZE(snd_ics_controls); idx++) {

			if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_ics_controls[idx], gus))) < 0)

			err = snd_ctl_add(card, snd_ctl_new1(&snd_ics_controls[idx], gus));

			if (err < 0)

				return err;

		}

	}

sound/isa/gus/gus_pcm.c

+14 −9
Original line number Diff line number Diff line
@@ -430,17 +430,19 @@ static int snd_gf1_pcm_playback_hw_params(struct snd_pcm_substream *substream, 
			snd_gf1_mem_free(&gus->gf1.mem_alloc, pcmp->memory);

			pcmp->memory = 0;

		}

		if ((block = snd_gf1_mem_alloc(&gus->gf1.mem_alloc,

		block = snd_gf1_mem_alloc(&gus->gf1.mem_alloc,

					  SNDRV_GF1_MEM_OWNER_DRIVER,

					  "GF1 PCM",

					  runtime->dma_bytes, 1, 32,

		                               NULL)) == NULL)

					  NULL);

		if (!block)

			return -ENOMEM;

		pcmp->memory = block->ptr;

	}

	pcmp->voices = params_channels(hw_params);

	if (pcmp->pvoices[0] == NULL) {

		if ((pcmp->pvoices[0] = snd_gf1_alloc_voice(pcmp->gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0)) == NULL)

		pcmp->pvoices[0] = snd_gf1_alloc_voice(pcmp->gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0);

		if (!pcmp->pvoices[0])

			return -ENOMEM;

		pcmp->pvoices[0]->handler_wave = snd_gf1_pcm_interrupt_wave;

		pcmp->pvoices[0]->handler_volume = snd_gf1_pcm_interrupt_volume;
@@ -448,7 +450,8 @@ static int snd_gf1_pcm_playback_hw_params(struct snd_pcm_substream *substream, 
		pcmp->pvoices[0]->private_data = pcmp;

	}

	if (pcmp->voices > 1 && pcmp->pvoices[1] == NULL) {

		if ((pcmp->pvoices[1] = snd_gf1_alloc_voice(pcmp->gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0)) == NULL)

		pcmp->pvoices[1] = snd_gf1_alloc_voice(pcmp->gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0);

		if (!pcmp->pvoices[1])

			return -ENOMEM;

		pcmp->pvoices[1]->handler_wave = snd_gf1_pcm_interrupt_wave;

		pcmp->pvoices[1]->handler_volume = snd_gf1_pcm_interrupt_volume;
@@ -689,7 +692,8 @@ static int snd_gf1_pcm_playback_open(struct snd_pcm_substream *substream) 
	printk(KERN_DEBUG "playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n",

	       (long) pcm->playback.buffer, (long) gus->gf1.pcm_buffer);

#endif

	if ((err = snd_gf1_dma_init(gus)) < 0)

	err = snd_gf1_dma_init(gus);

	if (err < 0)

		return err;

	pcmp->flags = SNDRV_GF1_PCM_PFLG_NONE;

	pcmp->substream = substream;
@@ -888,7 +892,8 @@ int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index) 
		kctl = snd_ctl_new1(&snd_gf1_pcm_volume_control1, gus);

	else

		kctl = snd_ctl_new1(&snd_gf1_pcm_volume_control, gus);

	if ((err = snd_ctl_add(card, kctl)) < 0)

	err = snd_ctl_add(card, kctl);

	if (err < 0)

		return err;

	kctl->id.index = control_index;

sound/isa/gus/gus_uart.c

+2 −1
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ int snd_gf1_rawmidi_new(struct snd_gus_card *gus, int device) 
	struct snd_rawmidi *rmidi;

	int err;



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

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

	if (err < 0)

		return err;

	strcpy(rmidi->name, gus->interwave ? "AMD InterWave" : "GF1");

	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_gf1_uart_output);