cleanup: fix all the header guards

This unifies all the EC header files to use __CROS_EC_FILENAME_H
as the include guard. Well, except for test/ util/ and extra/
which use __TEST_ __UTIL_ and __EXTRA_ prefixes respectively.

BUG=chromium:496895
BRANCH=none
TEST=make buildall -j

Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Change-Id: Iea71b3a08bdec94a11239de810a2b2e152b15029
Reviewed-on: https://chromium-review.googlesource.com/278121
Reviewed-by: Randall Spangler <rspangler@chromium.org>

10 files changed, 27 insertions, 27 deletions

diff --git a/util/comm-host.h b/util/comm-host.h
index 3477661c19..1d3cb9e36d 100644
--- a/util/comm-host.h
+++ b/util/comm-host.h
@@ -6,8 +6,8 @@
  * the EC. This abstracts them.
  */
 
-#ifndef COMM_HOST_H
-#define COMM_HOST_H
+#ifndef __UTIL_COMM_HOST_H
+#define __UTIL_COMM_HOST_H
 
 #include "common.h"
 #include "ec_commands.h"
@@ -74,4 +74,4 @@ extern int (*ec_command_proto)(int command, int version,
  */
 extern int (*ec_readmem)(int offset, int bytes, void *dest);
 
-#endif /* COMM_HOST_H */
+#endif /* __UTIL_COMM_HOST_H */
diff --git a/util/cros_ec_dev.h b/util/cros_ec_dev.h
index f6f5a5542c..89a54b9e80 100644
--- a/util/cros_ec_dev.h
+++ b/util/cros_ec_dev.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef _CROS_EC_DEV_H_
-#define _CROS_EC_DEV_H_
+#ifndef __UTIL_CROS_EC_DEV_H
+#define __UTIL_CROS_EC_DEV_H
 
 #include <linux/ioctl.h>
 #include <linux/types.h>
@@ -50,4 +50,4 @@ struct cros_ec_readmem {
 #define CROS_EC_DEV_IOCXCMD    _IOWR(':', 0, struct cros_ec_command)
 #define CROS_EC_DEV_IOCRDMEM   _IOWR(':', 1, struct cros_ec_readmem)
 
-#endif /* _CROS_EC_DEV_H_ */
+#endif /* __UTIL_CROS_EC_DEV_H */
diff --git a/util/ec_flash.h b/util/ec_flash.h
index 68a40fe466..e5b7baef79 100644
--- a/util/ec_flash.h
+++ b/util/ec_flash.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef __CROS_EC_EC_FLASH_H
-#define __CROS_EC_EC_FLASH_H
+#ifndef __UTIL_EC_FLASH_H
+#define __UTIL_EC_FLASH_H
 
 /**
  * Read EC flash memory
diff --git a/util/ec_sb_firmware_update.h b/util/ec_sb_firmware_update.h
index 6673ba99cf..5bddebaf4a 100644
--- a/util/ec_sb_firmware_update.h
+++ b/util/ec_sb_firmware_update.h
@@ -40,8 +40,8 @@
  *  9. cmd.0x35.read.status
  */
 
-#ifndef __CROS_EC_SB_FIRMWARE_UPDATE_H__
-#define __CROS_EC_SB_FIRMWARE_UPDATE_H__
+#ifndef __UTIL_EC_SB_FIRMWARE_UPDATE_H
+#define __UTIL_EC_SB_FIRMWARE_UPDATE_H
 
 struct sb_fw_header {
 	uint8_t signature[4]; /* "BTFW" */
diff --git a/util/lock/csem.h b/util/lock/csem.h
index 10a5c5ff94..469a824259 100644
--- a/util/lock/csem.h
+++ b/util/lock/csem.h
@@ -32,8 +32,8 @@
  * via Cobalt Networks.  It has been fairly extensively modified since then.
  */
 
-#ifndef CSEM_H__
-#define CSEM_H__
+#ifndef __UTIL_CSEM_H
+#define __UTIL_CSEM_H
 
 #include <sys/ipc.h>
 #include <time.h>
@@ -151,4 +151,4 @@ extern int csem_down_timeout_undo(int sem_id, struct timespec *timeout);
  */
 extern time_t csem_get_otime(int sem_id);
 
-#endif /* CSEM_H__ */
+#endif /* __UTIL_CSEM_H */
diff --git a/util/lock/gec_lock.h b/util/lock/gec_lock.h
index 13b0f9d92c..8480700ddd 100644
--- a/util/lock/gec_lock.h
+++ b/util/lock/gec_lock.h
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GEC_LOCK_H__
-#define GEC_LOCK_H__
+#ifndef __UTIL_GEC_LOCK_H
+#define __UTIL_GEC_LOCK_H
 
 /*
  * acquire_gec_lock  -  acquire global lock
@@ -48,4 +48,4 @@ extern int acquire_gec_lock(int timeout_secs);
  */
 extern int release_gec_lock(void);
 
-#endif /* GEC_LOCK_H__ */
+#endif /* __UTIL_GEC_LOCK_H */
diff --git a/util/lock/ipc_lock.h b/util/lock/ipc_lock.h
index b85de286b7..39ae277a7e 100644
--- a/util/lock/ipc_lock.h
+++ b/util/lock/ipc_lock.h
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef IPC_LOCK_H__
-#define IPC_LOCK_H__
+#ifndef __UTIL_IPC_LOCK_H
+#define __UTIL_IPC_LOCK_H
 
 #include <sys/ipc.h>
 
@@ -68,4 +68,4 @@ extern int acquire_lock(struct ipc_lock *lock, int timeout_msecs);
  */
 extern int release_lock(struct ipc_lock *lock);
 
-#endif /* IPC_LOCK_H__ */
+#endif /* __UTIL_IPC_LOCK_H */
diff --git a/util/lock/locks.h b/util/lock/locks.h
index 39dfc933f3..74360883fd 100644
--- a/util/lock/locks.h
+++ b/util/lock/locks.h
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LOCKS_H__
-#define LOCKS_H__
+#ifndef __UTIL_LOCKS_H
+#define __UTIL_LOCKS_H
 
 /* this is the base key, since we have to pick something global */
 #define IPC_LOCK_KEY	(0x67736c00 & 0xfffffc00) /* 22 bits "gsl" */
@@ -44,4 +44,4 @@
 /* for Google EC */
 #define GECLOCK		(IPC_LOCK_KEY + 1)
 
-#endif /* LOCKS_H__ */
+#endif /* __UTIL_LOCKS_H */
diff --git a/util/misc_util.h b/util/misc_util.h
index c550a1baa1..401710f0e5 100644
--- a/util/misc_util.h
+++ b/util/misc_util.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef __CROS_EC_MISC_UTIL_H
-#define __CROS_EC_MISC_UTIL_H
+#ifndef __UTIL_MISC_UTIL_H
+#define __UTIL_MISC_UTIL_H
 
 /* Don't use a macro where an inline will do... */
 static inline int MIN(int a, int b) { return a < b ? a : b; }
diff --git a/util/powerd_lock.h b/util/powerd_lock.h
index ddcd5f0553..86be184a19 100644
--- a/util/powerd_lock.h
+++ b/util/powerd_lock.h
@@ -21,8 +21,8 @@
  * powerd_lock.h: header file for power management routines
  */
 
-#ifndef __POWER_H__
-#define __POWER_H__ 1
+#ifndef __UTIL_POWERD_LOCK_H
+#define __UTIL_POWERD_LOCK_H 1
 
 enum POWERD_ERROR_CODE {
 	POWERD_OK = 0,
@@ -38,4 +38,4 @@ int disable_power_management(void);
 /* Re-enable power management. */
 int restore_power_management(void);
 
-#endif	/* __POWER_H__ */
+#endif	/* __UTIL_POWERD_LOCK_H */