From: Tzung-Bi Shih <tzungbi@google.com>
To: bleung@chromium.org, enric.balletbo@collabora.com,
groeck@chromium.org, rrangel@chromium.org
Cc: linux-kernel@vger.kernel.org, cychiang@google.com,
dgreid@google.com, tzungbi@google.com
Subject: [PATCH v4] platform/chrome: cros_ec_trace: update generating script
Date: Tue, 30 Jul 2019 21:47:04 +0800 [thread overview]
Message-ID: <20190730134704.44515-1-tzungbi@google.com> (raw)
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
next reply other threads:[~2019-07-30 13:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 13:47 Tzung-Bi Shih [this message]
2019-07-30 14:07 ` [PATCH v4] platform/chrome: cros_ec_trace: update generating script Tzung-Bi Shih
2019-08-01 10:59 ` Enric Balletbo i Serra
2019-08-01 13:04 ` Tzung-Bi Shih
2019-08-01 13:30 ` Enric Balletbo i Serra
2019-08-01 14:50 ` Raul Rangel
[not found] ` <CA+Px+wUzyFB6vRM91PTFkY_fBfp2xybegy34rbW_D9zzNX6-8Q@mail.gmail.com>
2019-08-29 13:42 ` Enric Balletbo i Serra
2019-08-29 13:51 ` Enric Balletbo Serra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190730134704.44515-1-tzungbi@google.com \
--to=tzungbi@google.com \
--cc=bleung@chromium.org \
--cc=cychiang@google.com \
--cc=dgreid@google.com \
--cc=enric.balletbo@collabora.com \
--cc=groeck@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rrangel@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox