Commit 34b946ee authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: trident: Fix assignment in if condition 

PCI Trident 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-51-tiwai@suse.de


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

sound/pci/trident/trident.c

+24 −17
Original line number Diff line number Diff line
@@ -67,11 +67,12 @@ static int snd_trident_probe(struct pci_dev *pci, 
	if (err < 0)

		return err;



	if ((err = snd_trident_create(card, pci,

	err = snd_trident_create(card, pci,

				 pcm_channels[dev],

				 ((pci->vendor << 16) | pci->device) == TRIDENT_DEVICE_ID_SI7018 ? 1 : 2,

				 wavetable_size[dev],

				      &trident)) < 0) {

				 &trident);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}
@@ -100,38 +101,44 @@ static int snd_trident_probe(struct pci_dev *pci, 
	sprintf(card->longname, "%s PCI Audio at 0x%lx, irq %d",

		card->shortname, trident->port, trident->irq);



	if ((err = snd_trident_pcm(trident, pcm_dev++)) < 0) {

	err = snd_trident_pcm(trident, pcm_dev++);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}

	switch (trident->device) {

	case TRIDENT_DEVICE_ID_DX:

	case TRIDENT_DEVICE_ID_NX:

		if ((err = snd_trident_foldback_pcm(trident, pcm_dev++)) < 0) {

		err = snd_trident_foldback_pcm(trident, pcm_dev++);

		if (err < 0) {

			snd_card_free(card);

			return err;

		}

		break;

	}

	if (trident->device == TRIDENT_DEVICE_ID_NX || trident->device == TRIDENT_DEVICE_ID_SI7018) {

		if ((err = snd_trident_spdif_pcm(trident, pcm_dev++)) < 0) {

		err = snd_trident_spdif_pcm(trident, pcm_dev++);

		if (err < 0) {

			snd_card_free(card);

			return err;

		}

	}

	if (trident->device != TRIDENT_DEVICE_ID_SI7018 &&

	    (err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,

	if (trident->device != TRIDENT_DEVICE_ID_SI7018) {

		err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,

					  trident->midi_port,

					  MPU401_INFO_INTEGRATED |

					  MPU401_INFO_IRQ_HOOK,

				       -1, &trident->rmidi)) < 0) {

					  -1, &trident->rmidi);

		if (err < 0) {

			snd_card_free(card);

			return err;

		}

	}



	snd_trident_create_gameport(trident);



	if ((err = snd_card_register(card)) < 0) {

	err = snd_card_register(card);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}

sound/pci/trident/trident_main.c

+57 −27
Original line number Diff line number Diff line
@@ -2119,7 +2119,8 @@ int snd_trident_pcm(struct snd_trident *trident, int device) 
	struct snd_pcm *pcm;

	int err;



	if ((err = snd_pcm_new(trident->card, "trident_dx_nx", device, trident->ChanPCM, 1, &pcm)) < 0)

	err = snd_pcm_new(trident->card, "trident_dx_nx", device, trident->ChanPCM, 1, &pcm);

	if (err < 0)

		return err;



	pcm->private_data = trident;
@@ -2178,7 +2179,8 @@ int snd_trident_foldback_pcm(struct snd_trident *trident, int device) 


	if (trident->device == TRIDENT_DEVICE_ID_NX)

		num_chan = 4;

	if ((err = snd_pcm_new(trident->card, "trident_dx_nx", device, 0, num_chan, &foldback)) < 0)

	err = snd_pcm_new(trident->card, "trident_dx_nx", device, 0, num_chan, &foldback);

	if (err < 0)

		return err;



	foldback->private_data = trident;
@@ -2228,7 +2230,8 @@ int snd_trident_spdif_pcm(struct snd_trident *trident, int device) 
	struct snd_pcm *spdif;

	int err;



	if ((err = snd_pcm_new(trident->card, "trident_dx_nx IEC958", device, 1, 0, &spdif)) < 0)

	err = snd_pcm_new(trident->card, "trident_dx_nx IEC958", device, 1, 0, &spdif);

	if (err < 0)

		return err;



	spdif->private_data = trident;
@@ -2921,7 +2924,8 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
	if (!uctl)

		return -ENOMEM;



	if ((err = snd_ac97_bus(trident->card, 0, &ops, NULL, &trident->ac97_bus)) < 0)

	err = snd_ac97_bus(trident->card, 0, &ops, NULL, &trident->ac97_bus);

	if (err < 0)

		goto __out;



	memset(&_ac97, 0, sizeof(_ac97));
@@ -2929,9 +2933,11 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
	trident->ac97_detect = 1;



      __again:

	if ((err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97)) < 0) {

	err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97);

	if (err < 0) {

		if (trident->device == TRIDENT_DEVICE_ID_SI7018) {

			if ((err = snd_trident_sis_reset(trident)) < 0)

			err = snd_trident_sis_reset(trident);

			if (err < 0)

				goto __out;

			if (retries-- > 0)

				goto __again;
@@ -2962,10 +2968,14 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
	trident->ac97_detect = 0;



	if (trident->device != TRIDENT_DEVICE_ID_SI7018) {

		if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_trident_vol_wave_control, trident))) < 0)

		kctl = snd_ctl_new1(&snd_trident_vol_wave_control, trident);

		err = snd_ctl_add(card, kctl);

		if (err < 0)

			goto __out;

		kctl->put(kctl, uctl);

		if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_trident_vol_music_control, trident))) < 0)

		kctl = snd_ctl_new1(&snd_trident_vol_music_control, trident);

		err = snd_ctl_add(card, kctl);

		if (err < 0)

			goto __out;

		kctl->put(kctl, uctl);

		outl(trident->musicvol_wavevol = 0x00000000, TRID_REG(trident, T4D_MUSICVOL_WAVEVOL));
@@ -2979,28 +2989,38 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
		tmix = &trident->pcm_mixer[idx];

		tmix->voice = NULL;

	}

	if ((trident->ctl_vol = snd_ctl_new1(&snd_trident_pcm_vol_control, trident)) == NULL)

	trident->ctl_vol = snd_ctl_new1(&snd_trident_pcm_vol_control, trident);

	if (!trident->ctl_vol)

		goto __nomem;

	if ((err = snd_ctl_add(card, trident->ctl_vol)))

	err = snd_ctl_add(card, trident->ctl_vol);

	if (err)

		goto __out;

		

	if ((trident->ctl_pan = snd_ctl_new1(&snd_trident_pcm_pan_control, trident)) == NULL)

	trident->ctl_pan = snd_ctl_new1(&snd_trident_pcm_pan_control, trident);

	if (!trident->ctl_pan)

		goto __nomem;

	if ((err = snd_ctl_add(card, trident->ctl_pan)))

	err = snd_ctl_add(card, trident->ctl_pan);

	if (err)

		goto __out;



	if ((trident->ctl_rvol = snd_ctl_new1(&snd_trident_pcm_rvol_control, trident)) == NULL)

	trident->ctl_rvol = snd_ctl_new1(&snd_trident_pcm_rvol_control, trident);

	if (!trident->ctl_rvol)

		goto __nomem;

	if ((err = snd_ctl_add(card, trident->ctl_rvol)))

	err = snd_ctl_add(card, trident->ctl_rvol);

	if (err)

		goto __out;



	if ((trident->ctl_cvol = snd_ctl_new1(&snd_trident_pcm_cvol_control, trident)) == NULL)

	trident->ctl_cvol = snd_ctl_new1(&snd_trident_pcm_cvol_control, trident);

	if (!trident->ctl_cvol)

		goto __nomem;

	if ((err = snd_ctl_add(card, trident->ctl_cvol)))

	err = snd_ctl_add(card, trident->ctl_cvol);

	if (err)

		goto __out;



	if (trident->device == TRIDENT_DEVICE_ID_NX) {

		if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_trident_ac97_rear_control, trident))) < 0)

		kctl = snd_ctl_new1(&snd_trident_ac97_rear_control, trident);

		err = snd_ctl_add(card, kctl);

		if (err < 0)

			goto __out;

		kctl->put(kctl, uctl);

	}
@@ -3016,7 +3036,8 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
		if (trident->ac97_sec && (trident->ac97_sec->ext_id & AC97_EI_SPDIF))

			kctl->id.index++;

		idx = kctl->id.index;

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

		err = snd_ctl_add(card, kctl);

		if (err < 0)

			goto __out;

		kctl->put(kctl, uctl);
@@ -3027,7 +3048,8 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
		}

		kctl->id.index = idx;

		kctl->id.device = pcm_spdif_device;

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

		err = snd_ctl_add(card, kctl);

		if (err < 0)

			goto __out;



		kctl = snd_ctl_new1(&snd_trident_spdif_mask, trident);
@@ -3037,7 +3059,8 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
		}

		kctl->id.index = idx;

		kctl->id.device = pcm_spdif_device;

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

		err = snd_ctl_add(card, kctl);

		if (err < 0)

			goto __out;



		kctl = snd_ctl_new1(&snd_trident_spdif_stream, trident);
@@ -3047,7 +3070,8 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) 
		}

		kctl->id.index = idx;

		kctl->id.device = pcm_spdif_device;

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

		err = snd_ctl_add(card, kctl);

		if (err < 0)

			goto __out;

		trident->spdif_pcm_ctl = kctl;

	}
@@ -3449,7 +3473,8 @@ static int snd_trident_sis_init(struct snd_trident *trident) 
{

	int err;



	if ((err = snd_trident_sis_reset(trident)) < 0)

	err = snd_trident_sis_reset(trident);

	if (err < 0)

		return err;



	snd_trident_stop_all_voices(trident);
@@ -3494,7 +3519,8 @@ int snd_trident_create(struct snd_card *card, 
	*rtrident = NULL;



	/* enable PCI device */

	if ((err = pci_enable_device(pci)) < 0)

	err = pci_enable_device(pci);

	if (err < 0)

		return err;

	/* check, if we can restrict PCI DMA transfers to 30 bits */

	if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(30))) {
@@ -3528,7 +3554,8 @@ int snd_trident_create(struct snd_card *card, 
	trident->midi_port = TRID_REG(trident, T4D_MPU401_BASE);

	pci_set_master(pci);



	if ((err = pci_request_regions(pci, "Trident Audio")) < 0) {

	err = pci_request_regions(pci, "Trident Audio");

	if (err < 0) {

		kfree(trident);

		pci_disable_device(pci);

		return err;
@@ -3548,7 +3575,8 @@ int snd_trident_create(struct snd_card *card, 
	trident->tlb.entries = NULL;

	trident->tlb.buffer.area = NULL;

	if (trident->device == TRIDENT_DEVICE_ID_NX) {

		if ((err = snd_trident_tlb_alloc(trident)) < 0) {

		err = snd_trident_tlb_alloc(trident);

		if (err < 0) {

			snd_trident_free(trident);

			return err;

		}
@@ -3576,12 +3604,14 @@ int snd_trident_create(struct snd_card *card, 
		return err;

	}



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

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

	if (err < 0) {

		snd_trident_free(trident);

		return err;

	}



	if ((err = snd_trident_mixer(trident, pcm_spdif_device)) < 0)

	err = snd_trident_mixer(trident, pcm_spdif_device);

	if (err < 0)

		return err;

	

	/* initialise synth voices */