Consolidate all util.hpp

This deletes all lower level util.hpp and cats them
into the top level util.hpp to avoid name conflicts.

Change-Id: Ia11e4a08053a3970b0aadf21d1156ab26def36bd
Signed-off-by: James Feist <james.feist@linux.intel.com>

2 files changed, 2 insertions, 11 deletions

diff --git a/pid/util.cpp b/pid/util.cpp
index 5c6e5d4..0a8f892 100644
--- a/pid/util.cpp
+++ b/pid/util.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "util.hpp"
+
 #include "ec/pid.hpp"
 
 #include <cstring>
diff --git a/pid/util.hpp b/pid/util.hpp
deleted file mode 100644
index c35f0b8..0000000
--- a/pid/util.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "ec/pid.hpp"
-
-/*
- * Given a configuration structure, fill out the information we use within the
- * PID loop.
- */
-void initializePIDStruct(ec::pid_info_t* info, const ec::pidinfo& initial);
-
-void dumpPIDStruct(ec::pid_info_t* info);