lkml.org 
[lkml]   [2019]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH v4] platform/chrome: cros_ec_trace: update generating script
From
The original script generates unneeded ", \" on the last line which
results in compile error if one would forget to remove them. Update the
script to not generate ", \" on the last line. Also add a define guard
for EC_CMDS.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
Changes from v1:
- simpler awk code
Changes from v2:
- use c style comments instead of c++ style
- use '@' delimiter in sed instead of '/' to avoid unintentional end of
comment "*/"
Changes from v3:
- more detail commit message
- add define guard for EC_CMDS

drivers/platform/chrome/cros_ec_trace.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_trace.c b/drivers/platform/chrome/cros_ec_trace.c
index 0a76412095a9..1412ae024435 100644
--- a/drivers/platform/chrome/cros_ec_trace.c
+++ b/drivers/platform/chrome/cros_ec_trace.c
@@ -5,8 +5,27 @@

#define TRACE_SYMBOL(a) {a, #a}

-// Generate the list using the following script:
-// sed -n 's/^#define \(EC_CMD_[[:alnum:]_]*\)\s.*/\tTRACE_SYMBOL(\1), \\/p' include/linux/mfd/cros_ec_commands.h
+/*
+ * Generate the list using the following script:
+ * sed -n 's@^#define \(EC_CMD_[[:alnum:]_]*\)\s.*@\tTRACE_SYMBOL(\1), \\@p' \
+ * include/linux/mfd/cros_ec_commands.h | awk '
+ * BEGIN {
+ * print "#ifndef EC_CMDS";
+ * print "#define EC_CMDS \\";
+ * }
+ * {
+ * if (NR != 1)
+ * print buf;
+ * buf = $0;
+ * }
+ * END {
+ * gsub(/, \\/, "", buf);
+ * print buf;
+ * print "#endif";
+ * }
+ * '
+ */
+#ifndef EC_CMDS
#define EC_CMDS \
TRACE_SYMBOL(EC_CMD_PROTO_VERSION), \
TRACE_SYMBOL(EC_CMD_HELLO), \
@@ -119,6 +138,7 @@
TRACE_SYMBOL(EC_CMD_PD_CHARGE_PORT_OVERRIDE), \
TRACE_SYMBOL(EC_CMD_PD_GET_LOG_ENTRY), \
TRACE_SYMBOL(EC_CMD_USB_PD_MUX_INFO)
+#endif

#define CREATE_TRACE_POINTS
#include "cros_ec_trace.h"
--
2.22.0.709.g102302147b-goog
\
 
 \ /
  Last update: 2019-07-30 15:49    [W:0.069 / U:19.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site