[PATCH 1/2] ALSA: rme9652: Use common code in hdsp_get_iobox_version()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Tue, 5 Sep 2017 22:08:30 +0200

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: Markus Elfring <elfr...@users.sourceforge.net>
---
 sound/pci/rme9652/hdsp.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 0ff41f9ab434..9f0f73875f01 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -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;
 }
 
 
-- 
2.14.1