[PATCH 09/30] mfd: cros_ec: Remove zero-size structs

From: Gwendal Grignou
Date: Wed Apr 24 2019 - 19:31:25 EST


Empty structure size is different between C and C++.
To prevent clang warning when compiling this include file in C++
programs, remove empty structures.

Signed-off-by: Gwendal Grignou <gwendal@xxxxxxxxxxxx>
---
include/linux/mfd/cros_ec_commands.h | 33 +++++++++++++++-------------
1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index 67e15c29e083..2e5c93d858d8 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -1510,10 +1510,14 @@ struct lightbar_program {
struct ec_params_lightbar {
uint8_t cmd; /* Command (see enum lightbar_command) */
union {
- struct {
- /* no args */
- } dump, off, on, init, get_seq, get_params_v0, get_params_v1,
- version, get_brightness, get_demo, suspend, resume;
+ /*
+ * The following commands have no args:
+ *
+ * dump, off, on, init, get_seq, get_params_v0, get_params_v1,
+ * version, get_brightness, get_demo, suspend, resume
+ *
+ * Don't use an empty struct, because C++ hates that.
+ */

struct __ec_todo_unpacked {
uint8_t num;
@@ -1567,11 +1571,13 @@ struct ec_response_lightbar {
uint8_t red, green, blue;
} get_rgb;

- struct {
- /* no return params */
- } off, on, init, set_brightness, seq, reg, set_rgb,
- demo, set_params_v0, set_params_v1,
- set_program, manual_suspend_ctrl, suspend, resume;
+ /*
+ * The following commands have no response:
+ *
+ * off, on, init, set_brightness, seq, reg, set_rgb,
+ * set_params_v0, set_params_v1, set_program,
+ * manual_suspend_ctrl, suspend, resume
+ */
};
} __ec_todo_packed;

@@ -2991,9 +2997,7 @@ enum charge_state_params {
struct ec_params_charge_state {
uint8_t cmd; /* enum charge_state_command */
union {
- struct {
- /* no args */
- } get_state;
+ /* get_state has no args */

struct __ec_todo_unpacked {
uint32_t param; /* enum charge_state_param */
@@ -3019,9 +3023,8 @@ struct ec_response_charge_state {
struct __ec_align4 {
uint32_t value;
} get_param;
- struct {
- /* no return values */
- } set_param;
+
+ /* set_param returns no args */
};
} __ec_align4;

--
2.21.0.593.g511ec345e18-goog