Commit 73debecf authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: mixart: Fix assignment in if condition 

PCI miXart driver code contains a few 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-45-tiwai@suse.de


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

sound/pci/mixart/mixart.c

+18 −11
Original line number Diff line number Diff line
@@ -954,9 +954,10 @@ static int snd_mixart_pcm_analog(struct snd_mixart *chip) 
	char name[32];



	sprintf(name, "miXart analog %d", chip->chip_idx);

	if ((err = snd_pcm_new(chip->card, name, MIXART_PCM_ANALOG,

	err = snd_pcm_new(chip->card, name, MIXART_PCM_ANALOG,

			  MIXART_PLAYBACK_STREAMS,

			       MIXART_CAPTURE_STREAMS, &pcm)) < 0) {

			  MIXART_CAPTURE_STREAMS, &pcm);

	if (err < 0) {

		dev_err(chip->card->dev,

			"cannot create the analog pcm %d\n", chip->chip_idx);

		return err;
@@ -987,9 +988,10 @@ static int snd_mixart_pcm_digital(struct snd_mixart *chip) 
	char name[32];



	sprintf(name, "miXart AES/EBU %d", chip->chip_idx);

	if ((err = snd_pcm_new(chip->card, name, MIXART_PCM_DIGITAL,

	err = snd_pcm_new(chip->card, name, MIXART_PCM_DIGITAL,

			  MIXART_PLAYBACK_STREAMS,

			       MIXART_CAPTURE_STREAMS, &pcm)) < 0) {

			  MIXART_CAPTURE_STREAMS, &pcm);

	if (err < 0) {

		dev_err(chip->card->dev,

			"cannot create the digital pcm %d\n", chip->chip_idx);

		return err;
@@ -1042,7 +1044,8 @@ static int snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int 
	chip->mgr = mgr;

	card->sync_irq = mgr->irq;



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

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

	if (err < 0) {

		snd_mixart_chip_free(chip);

		return err;

	}
@@ -1243,7 +1246,8 @@ static int snd_mixart_probe(struct pci_dev *pci, 
	}



	/* enable PCI device */

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

	err = pci_enable_device(pci);

	if (err < 0)

		return err;

	pci_set_master(pci);
@@ -1267,7 +1271,8 @@ static int snd_mixart_probe(struct pci_dev *pci, 
	mgr->irq = -1;



	/* resource assignment */

	if ((err = pci_request_regions(pci, CARD_NAME)) < 0) {

	err = pci_request_regions(pci, CARD_NAME);

	if (err < 0) {

		kfree(mgr);

		pci_disable_device(pci);

		return err;
@@ -1332,7 +1337,8 @@ static int snd_mixart_probe(struct pci_dev *pci, 
			"Digigram miXart at 0x%lx & 0x%lx, irq %i [PCM #%d]",

			mgr->mem[0].phys, mgr->mem[1].phys, mgr->irq, i);



		if ((err = snd_mixart_create(mgr, card, i)) < 0) {

		err = snd_mixart_create(mgr, card, i);

		if (err < 0) {

			snd_card_free(card);

			snd_mixart_free(mgr);

			return err;
@@ -1343,7 +1349,8 @@ static int snd_mixart_probe(struct pci_dev *pci, 
			snd_mixart_proc_init(mgr->chip[i]);

		}



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

		err = snd_card_register(card);

		if (err < 0) {

			snd_mixart_free(mgr);

			return err;

		}

sound/pci/mixart/mixart_hwdep.c

+12 −5
Original line number Diff line number Diff line
@@ -306,9 +306,13 @@ static int mixart_first_init(struct mixart_mgr *mgr) 
	int err;

	struct mixart_msg request;



	if((err = mixart_enum_connectors(mgr)) < 0) return err;

	err = mixart_enum_connectors(mgr);

	if (err < 0)

		return err;



	if((err = mixart_enum_physio(mgr)) < 0) return err;

	err = mixart_enum_physio(mgr);

	if (err < 0)

		return err;



	/* send a synchro command to card (necessary to do this before first MSG_STREAM_START_STREAM_GRP_PACKET) */

	/* though why not here */
@@ -528,15 +532,18 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw 
        for (card_index = 0; card_index < mgr->num_cards; card_index++) {

		struct snd_mixart *chip = mgr->chip[card_index];



		if ((err = snd_mixart_create_pcm(chip)) < 0)

		err = snd_mixart_create_pcm(chip);

		if (err < 0)

			return err;



		if (card_index == 0) {

			if ((err = snd_mixart_create_mixer(chip->mgr)) < 0)

			err = snd_mixart_create_mixer(chip->mgr);

			if (err < 0)

	        		return err;

		}



		if ((err = snd_card_register(chip->card)) < 0)

		err = snd_card_register(chip->card);

		if (err < 0)

			return err;

	}

sound/pci/mixart/mixart_mixer.c

+22 −11
Original line number Diff line number Diff line
@@ -1114,10 +1114,12 @@ int snd_mixart_create_mixer(struct mixart_mgr *mgr) 
		temp = mixart_control_analog_level;

		temp.name = "Master Playback Volume";

		temp.private_value = 0; /* playback */

		if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

		err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

		if (err < 0)

			return err;

		/* output mute controls */

		if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&mixart_control_output_switch, chip))) < 0)

		err = snd_ctl_add(chip->card, snd_ctl_new1(&mixart_control_output_switch, chip));

		if (err < 0)

			return err;



		/* analog input level control only on first two chips !*/
@@ -1125,7 +1127,8 @@ int snd_mixart_create_mixer(struct mixart_mgr *mgr) 
			temp = mixart_control_analog_level;

			temp.name = "Master Capture Volume";

			temp.private_value = 1; /* capture */

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

			err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

			if (err < 0)

				return err;

		}
@@ -1133,45 +1136,53 @@ int snd_mixart_create_mixer(struct mixart_mgr *mgr) 
		temp.name = "PCM Playback Volume";

		temp.count = MIXART_PLAYBACK_STREAMS;

		temp.private_value = 0; /* playback analog */

		if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

		err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

		if (err < 0)

			return err;



		temp.name = "PCM Capture Volume";

		temp.count = 1;

		temp.private_value = MIXART_VOL_REC_MASK; /* capture analog */

		if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

		err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

		if (err < 0)

			return err;



		if(mgr->board_type == MIXART_DAUGHTER_TYPE_AES) {

			temp.name = "AES Playback Volume";

			temp.count = MIXART_PLAYBACK_STREAMS;

			temp.private_value = MIXART_VOL_AES_MASK; /* playback AES/EBU */

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

			err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

			if (err < 0)

				return err;



			temp.name = "AES Capture Volume";

			temp.count = 0;

			temp.private_value = MIXART_VOL_REC_MASK | MIXART_VOL_AES_MASK; /* capture AES/EBU */

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

			err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

			if (err < 0)

				return err;

		}

		temp = mixart_control_pcm_switch;

		temp.name = "PCM Playback Switch";

		temp.private_value = 0; /* playback analog */

		if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

		err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

		if (err < 0)

			return err;



		if(mgr->board_type == MIXART_DAUGHTER_TYPE_AES) {

			temp.name = "AES Playback Switch";

			temp.private_value = MIXART_VOL_AES_MASK; /* playback AES/EBU */

			if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip))) < 0)

			err = snd_ctl_add(chip->card, snd_ctl_new1(&temp, chip));

			if (err < 0)

				return err;

		}



		/* monitoring */

		if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&mixart_control_monitor_vol, chip))) < 0)

		err = snd_ctl_add(chip->card, snd_ctl_new1(&mixart_control_monitor_vol, chip));

		if (err < 0)

			return err;

		if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&mixart_control_monitor_sw, chip))) < 0)

		err = snd_ctl_add(chip->card, snd_ctl_new1(&mixart_control_monitor_sw, chip));

		if (err < 0)

			return err;



		/* init all mixer data and program the master volumes/switches */