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

Commit 99dcad32 authored by Markus Elfring's avatar Markus Elfring Committed by Takashi Iwai
Browse files

ALSA: rme9652: Use common code in hdsp_get_iobox_version() 



Add a jump target so that a bit of common code can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 468778a0

sound/pci/rme9652/hdsp.c

+11 −15
Original line number Diff line number Diff line
@@ -793,11 +793,8 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp) 


		hdsp_write(hdsp, HDSP_control2Reg, HDSP_S200 | HDSP_PROGRAM);

		hdsp_write (hdsp, HDSP_fifoData, 0);

		if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT) < 0) {

			hdsp->io_type = Multiface;

			dev_info(hdsp->card->dev, "Multiface found\n");

			return 0;

		}

		if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT) < 0)

			goto set_multi;



		hdsp_write(hdsp, HDSP_control2Reg, HDSP_S_LOAD);

		hdsp_write(hdsp, HDSP_fifoData, 0);
@@ -810,20 +807,14 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp) 
		hdsp_write(hdsp, HDSP_control2Reg, HDSP_S300);

		hdsp_write(hdsp, HDSP_control2Reg, HDSP_S_LOAD);

		hdsp_write(hdsp, HDSP_fifoData, 0);

		if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT) == 0) {

			hdsp->io_type = Multiface;

			dev_info(hdsp->card->dev, "Multiface found\n");

			return 0;

		}

		if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT) == 0)

			goto set_multi;



		hdsp_write(hdsp, HDSP_control2Reg, HDSP_S300);

		hdsp_write(hdsp, HDSP_control2Reg, HDSP_S_LOAD);

		hdsp_write(hdsp, HDSP_fifoData, 0);

		if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT) < 0) {

			hdsp->io_type = Multiface;

			dev_info(hdsp->card->dev, "Multiface found\n");

			return 0;

		}

		if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT) < 0)

			goto set_multi;



		hdsp->io_type = RPM;

		dev_info(hdsp->card->dev, "RPM found\n");
@@ -838,6 +829,11 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp) 
			hdsp->io_type = Digiface;

	}

	return 0;



set_multi:

	hdsp->io_type = Multiface;

	dev_info(hdsp->card->dev, "Multiface found\n");

	return 0;

}