Commit 520226e9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: wavefront: Fix assignment in if condition 

ISA WaveFront 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-7-tiwai@suse.de


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

sound/isa/wavefront/wavefront.c

+4 −2
Original line number Diff line number Diff line
@@ -555,7 +555,8 @@ static int snd_wavefront_isa_probe(struct device *pdev, 
	err = snd_wavefront_card_new(pdev, dev, &card);

	if (err < 0)

		return err;

	if ((err = snd_wavefront_probe(card, dev)) < 0) {

	err = snd_wavefront_probe(card, dev);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}
@@ -610,7 +611,8 @@ static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard, 
		}

	}



	if ((res = snd_wavefront_probe(card, dev)) < 0)

	res = snd_wavefront_probe(card, dev);

	if (res < 0)

		return res;



	pnp_set_card_drvdata(pcard, card);

sound/isa/wavefront/wavefront_midi.c

+12 −8
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ static int snd_wavefront_midi_input_open(struct snd_rawmidi_substream *substream 


	mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);



	if ((midi = get_wavefront_midi (substream)) == NULL)

	midi = get_wavefront_midi(substream);

	if (!midi)

	        return -EIO;



	spin_lock_irqsave (&midi->open, flags);
@@ -263,7 +264,8 @@ static int snd_wavefront_midi_output_open(struct snd_rawmidi_substream *substrea 


	mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);



	if ((midi = get_wavefront_midi (substream)) == NULL)

	midi = get_wavefront_midi(substream);

	if (!midi)

	        return -EIO;



	spin_lock_irqsave (&midi->open, flags);
@@ -287,7 +289,8 @@ static int snd_wavefront_midi_input_close(struct snd_rawmidi_substream *substrea 


	mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);



	if ((midi = get_wavefront_midi (substream)) == NULL)

	midi = get_wavefront_midi(substream);

	if (!midi)

	        return -EIO;



	spin_lock_irqsave (&midi->open, flags);
@@ -310,7 +313,8 @@ static int snd_wavefront_midi_output_close(struct snd_rawmidi_substream *substre 


	mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);



	if ((midi = get_wavefront_midi (substream)) == NULL)

	midi = get_wavefront_midi(substream);

	if (!midi)

	        return -EIO;



	spin_lock_irqsave (&midi->open, flags);
@@ -333,9 +337,9 @@ static void snd_wavefront_midi_input_trigger(struct snd_rawmidi_substream *subst 


	mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);



	if ((midi = get_wavefront_midi (substream)) == NULL) {

	midi = get_wavefront_midi(substream);

	if (!midi)

		return;

	}



	spin_lock_irqsave (&midi->virtual, flags);

	if (up) {
@@ -372,9 +376,9 @@ static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *subs 


	mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);



	if ((midi = get_wavefront_midi (substream)) == NULL) {

	midi = get_wavefront_midi(substream);

	if (!midi)

		return;

	}



	spin_lock_irqsave (&midi->virtual, flags);

	if (up) {

sound/isa/wavefront/wavefront_synth.c

+34 −22
Original line number Diff line number Diff line
@@ -339,7 +339,8 @@ snd_wavefront_cmd (snd_wavefront_t *dev, 
	int c;

	struct wavefront_command *wfcmd;



	if ((wfcmd = wavefront_get_command (cmd)) == NULL) {

	wfcmd = wavefront_get_command(cmd);

	if (!wfcmd) {

		snd_printk ("command 0x%x not supported.\n",

			cmd);

		return 1;
@@ -391,7 +392,8 @@ snd_wavefront_cmd (snd_wavefront_t *dev, 


		for (i = 0; i < wfcmd->read_cnt; i++) {



			if ((c = wavefront_read (dev)) == -1) {

			c = wavefront_read(dev);

			if (c == -1) {

				DPRINT (WF_DEBUG_IO, "bad read for byte "

						      "%d of 0x%x [%s].\n",

						      i, cmd, wfcmd->action);
@@ -401,7 +403,8 @@ snd_wavefront_cmd (snd_wavefront_t *dev, 
			/* Now handle errors. Lots of special cases here */

	    

			if (c == 0xff) { 

				if ((c = wavefront_read (dev)) == -1) {

				c = wavefront_read(dev);

				if (c == -1) {

					DPRINT (WF_DEBUG_IO, "bad read for "

							      "error byte at "

							      "read byte %d "
@@ -459,9 +462,9 @@ snd_wavefront_cmd (snd_wavefront_t *dev, 
		   of the standard value.

		*/

	    

		if ((ack = wavefront_read (dev)) == 0) {

		ack = wavefront_read(dev);

		if (ack == 0)

			ack = WF_ACK;

		}

	

		if (ack != WF_ACK) {

			if (ack == -1) {
@@ -475,7 +478,8 @@ snd_wavefront_cmd (snd_wavefront_t *dev, 


				if (ack == 0xff) { /* explicit error */

		    

					if ((err = wavefront_read (dev)) == -1) {

					err = wavefront_read(dev);

					if (err == -1) {

						DPRINT (WF_DEBUG_DATA,

							"cannot read err "

							"for 0x%x [%s].\n",
@@ -603,9 +607,9 @@ wavefront_delete_sample (snd_wavefront_t *dev, int sample_num) 
	wbuf[0] = sample_num & 0x7f;

	wbuf[1] = sample_num >> 7;



	if ((x = snd_wavefront_cmd (dev, WFC_DELETE_SAMPLE, NULL, wbuf)) == 0) {

	x = snd_wavefront_cmd(dev, WFC_DELETE_SAMPLE, NULL, wbuf);

	if (!x)

		dev->sample_status[sample_num] = WF_ST_EMPTY;

	}



	return x;

}
@@ -691,8 +695,9 @@ wavefront_get_patch_status (snd_wavefront_t *dev) 
		patchnum[0] = i & 0x7f;

		patchnum[1] = i >> 7;



		if ((x = snd_wavefront_cmd (dev, WFC_UPLOAD_PATCH, patchbuf,

					patchnum)) == 0) {

		x = snd_wavefront_cmd(dev, WFC_UPLOAD_PATCH, patchbuf,

				      patchnum);

		if (x == 0) {



			dev->patch_status[i] |= WF_SLOT_FILLED;

			p = (wavefront_patch *) patchbuf;
@@ -738,8 +743,9 @@ wavefront_get_program_status (snd_wavefront_t *dev) 
	for (i = 0; i < WF_MAX_PROGRAM; i++) {

		prognum = i;



		if ((x = snd_wavefront_cmd (dev, WFC_UPLOAD_PROGRAM, progbuf,

					&prognum)) == 0) {

		x = snd_wavefront_cmd(dev, WFC_UPLOAD_PROGRAM, progbuf,

				      &prognum);

		if (x == 0) {



			dev->prog_status[i] |= WF_SLOT_USED;
@@ -894,9 +900,9 @@ wavefront_send_sample (snd_wavefront_t *dev, 
	if (header->number == WAVEFRONT_FIND_FREE_SAMPLE_SLOT) {

		int x;



		if ((x = wavefront_find_free_sample (dev)) < 0) {

		x = wavefront_find_free_sample(dev);

		if (x < 0)

			return -ENOMEM;

		}

		snd_printk ("unspecified sample => %d\n", x);

		header->number = x;

	}
@@ -1137,7 +1143,8 @@ wavefront_send_sample (snd_wavefront_t *dev, 
		   nothing to do with DMA at all.

		*/

	

		if ((dma_ack = wavefront_read (dev)) != WF_DMA_ACK) {

		dma_ack = wavefront_read(dev);

		if (dma_ack != WF_DMA_ACK) {

			if (dma_ack == -1) {

				snd_printk ("upload sample "

					    "DMA ack timeout\n");
@@ -1282,14 +1289,16 @@ wavefront_fetch_multisample (snd_wavefront_t *dev, 
		char d[2];

		int val;

	

		if ((val = wavefront_read (dev)) == -1) {

		val = wavefront_read(dev);

		if (val == -1) {

			snd_printk ("upload multisample failed "

				    "during sample loop.\n");

			return -EIO;

		}

		d[0] = val;



		if ((val = wavefront_read (dev)) == -1) {

		val = wavefront_read(dev);

		if (val == -1) {

			snd_printk ("upload multisample failed "

				    "during sample loop.\n");

			return -EIO;
@@ -1910,7 +1919,8 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev) 
		goto gone_bad;

	}

	

	if ((hwv[0] = wavefront_read (dev)) == -1) {

	hwv[0] = wavefront_read(dev);

	if (hwv[0] == -1) {

		snd_printk ("board not responding correctly.\n");

		goto gone_bad;

	}
@@ -1921,7 +1931,8 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev) 
		   and tell us about it either way.

		*/

		

		if ((hwv[0] = wavefront_read (dev)) == -1) {

		hwv[0] = wavefront_read(dev);

		if (hwv[0] == -1) {

			snd_printk ("on-board RAM test failed "

				    "(bad error code).\n");

		} else {
@@ -1934,7 +1945,8 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev) 


	/* We're OK, just get the next byte of the HW version response */



	if ((hwv[1] = wavefront_read (dev)) == -1) {

	hwv[1] = wavefront_read(dev);

	if (hwv[1] == -1) {

		snd_printk ("incorrect h/w response.\n");

		goto gone_bad;

	}
@@ -2079,9 +2091,9 @@ wavefront_do_reset (snd_wavefront_t *dev) 
	   about it.

	*/

	

	if ((dev->freemem = wavefront_freemem (dev)) < 0) {

	dev->freemem = wavefront_freemem(dev);

	if (dev->freemem < 0)

		goto gone_bad;

	}

		

	snd_printk ("available DRAM %dk\n", dev->freemem / 1024);