[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-iio
Subject:    [PATCH 10/17] iio: cros_ec: Use cros_ec_send_cmd_msg()
From:       Prashant Malani <pmalani () chromium ! org>
Date:       2020-01-30 20:30:54
Message-ID: 20200130203106.201894-11-pmalani () chromium ! org
[Download RAW message or body]

Replace cros_ec_cmd_xfer_status() with cros_ec_send_cmd_msg()
which does the message buffer setup and cleanup.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
---
 .../cros_ec_sensors/cros_ec_sensors_core.c    | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c \
b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c index \
                81a7f692de2f37..f92032e97a84d7 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
@@ -31,24 +31,16 @@ static int cros_ec_get_host_cmd_version_mask(struct \
cros_ec_device *ec_dev,  u16 cmd_offset, u16 cmd, u32 *mask)
 {
 	int ret;
-	struct {
-		struct cros_ec_command msg;
-		union {
-			struct ec_params_get_cmd_versions params;
-			struct ec_response_get_cmd_versions resp;
-		};
-	} __packed buf = {
-		.msg = {
-			.command = EC_CMD_GET_CMD_VERSIONS + cmd_offset,
-			.insize = sizeof(struct ec_response_get_cmd_versions),
-			.outsize = sizeof(struct ec_params_get_cmd_versions)
-			},
-		.params = {.cmd = cmd}
-	};
-
-	ret = cros_ec_cmd_xfer_status(ec_dev, &buf.msg);
+	struct ec_params_get_cmd_versions params = {0};
+	struct ec_response_get_cmd_versions resp = {0};
+
+	params.cmd = cmd;
+	ret = cros_ec_send_cmd_msg(ec_dev, 0,
+				   EC_CMD_GET_CMD_VERSIONS + cmd_offset,
+				   &params, sizeof(params),
+				   &resp, sizeof(resp));
 	if (ret >= 0)
-		*mask = buf.resp.version_mask;
+		*mask = resp.version_mask;
 	return ret;
 }
 
@@ -164,15 +156,22 @@ int cros_ec_motion_send_host_cmd(struct \
cros_ec_sensors_core_state *state,  u16 opt_length)
 {
 	int ret;
+	struct cros_ec_command *msg = state->msg;
 
 	if (opt_length)
-		state->msg->insize = min(opt_length, state->ec->max_response);
+		msg->insize = min(opt_length, state->ec->max_response);
 	else
-		state->msg->insize = state->ec->max_response;
+		msg->insize = state->ec->max_response;
 
-	memcpy(state->msg->data, &state->param, sizeof(state->param));
-
-	ret = cros_ec_cmd_xfer_status(state->ec, state->msg);
+	/*
+	 * In order to not disrupt the usage of struct cros_ec_command *msg,
+	 * which is defined higher up in the call stack, we pass in its
+	 * members to cros_ec_send_cmd_msg, instead of removing it at all
+	 * calling locations.
+	 */
+	ret = cros_ec_send_cmd_msg(state->ec, msg->version, msg->command,
+				   &state->param, sizeof(state->param),
+				   msg->data, msg->insize);
 	if (ret < 0)
 		return ret;
 
-- 
2.25.0.341.g760bfbb309-goog


[prev in list] [next in list] [prev in thread] [next in thread]