IOMUX: Split out iomux_match_device() helper

Deduplicate the code used in a few places by splitting out a common helper.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/common/console.c b/common/console.c
index 7b6861f..523fb45 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -252,15 +252,14 @@ static void console_devices_set(int file, struct stdio_dev *dev)
  */
 static bool console_needs_start_stop(int file, struct stdio_dev *sdev)
 {
-       int i, j;
+       int i;
 
        for (i = 0; i < ARRAY_SIZE(cd_count); i++) {
                if (i == file)
                        continue;
 
-               for (j = 0; j < cd_count[i]; j++)
-                       if (console_devices[i][j] == sdev)
-                               return false;
+               if (iomux_match_device(console_devices[i], cd_count[i], sdev) >= 0)
+                       return false;
        }
        return true;
 }

diff --git a/common/iomux.c b/common/iomux.c
index 5d02756..a8be1ac 100644 (file)
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -22,11 +22,21 @@ void iomux_printdevs(const int console)
        printf("\n");
 }
 
+int iomux_match_device(struct stdio_dev **set, const int n, struct stdio_dev *sdev)
+{
+       int i;
+
+       for (i = 0; i < n; i++)
+               if (sdev == set[i])
+                       return i;
+       return -ENOENT;
+}
+
 /* This tries to preserve the old list if an error occurs. */
 int iomux_doenv(const int console, const char *arg)
 {
        char *console_args, *temp, **start;
-       int i, j, k, io_flag, cs_idx, repeat;
+       int i, j, io_flag, cs_idx, repeat;
        struct stdio_dev **cons_set, **old_set;
        struct stdio_dev *dev;
 
@@ -96,14 +106,8 @@ int iomux_doenv(const int console, const char *arg)
                /*
                 * Prevent multiple entries for a device.
                 */
-                repeat = 0;
-                for (k = 0; k < cs_idx; k++) {
-                       if (dev == cons_set[k]) {
-                               repeat++;
-                               break;
-                       }
-                }
-                if (repeat)
+                repeat = iomux_match_device(cons_set, cs_idx, dev);
+                if (repeat >= 0)
                        continue;
                /*
                 * Try assigning the specified device.
@@ -129,10 +133,7 @@ int iomux_doenv(const int console, const char *arg)
 
        /* Stop dropped consoles */
        for (i = 0; i < repeat; i++) {
-               for (j = 0; j < cs_idx; j++) {
-                       if (old_set[i] == cons_set[j])
-                               break;
-               }
+               j = iomux_match_device(cons_set, cs_idx, old_set[i]);
                if (j == cs_idx)
                        console_stop(console, old_set[i]);
        }

diff --git a/include/iomux.h b/include/iomux.h
index da7ff69..9c2d579 100644 (file)
--- a/include/iomux.h
+++ b/include/iomux.h
@@ -24,6 +24,7 @@ extern struct stdio_dev **console_devices[MAX_FILES];
  */
 extern int cd_count[MAX_FILES];
 
+int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *);
 int iomux_doenv(const int, const char *);
 void iomux_printdevs(const int);