2020-02-05 19:08:19

by Prashant Malani

Subject: [PATCH v2 05/17] platform/chrome: sensorhub: Use cros_ec_cmd()

Update the register() function to use the new cros_ec_cmd() function
instead of cros_ec_cmd_xfer_status().

Signed-off-by: Prashant Malani <[email protected]>
---

Changes in v2:
- Updated to use new function name and parameter list.

drivers/platform/chrome/cros_ec_sensorhub.c | 30 +++++++++------------
1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_sensorhub.c b/drivers/platform/chrome/cros_ec_sensorhub.c
index 79fefd3bb0fa61..3ccf98af89453c 100644
--- a/drivers/platform/chrome/cros_ec_sensorhub.c
+++ b/drivers/platform/chrome/cros_ec_sensorhub.c
@@ -53,7 +53,7 @@ static int cros_ec_sensorhub_register(struct device *dev,
struct cros_ec_dev *ec = sensorhub->ec;
struct ec_params_motion_sense *params;
struct ec_response_motion_sense *resp;
- struct cros_ec_command *msg;
+ void *ec_buf;
int ret, i, sensor_num;
char *name;

@@ -70,27 +70,24 @@ static int cros_ec_sensorhub_register(struct device *dev,
return -EINVAL;
}

- /* Prepare a message to send INFO command to each sensor. */
- msg = kzalloc(sizeof(*msg) + max(sizeof(*params), sizeof(*resp)),
- GFP_KERNEL);
- if (!msg)
+ ec_buf = kzalloc(max(sizeof(*params), sizeof(*resp)), GFP_KERNEL);
+ if (!ec_buf)
return -ENOMEM;

- msg->version = 1;
- msg->command = EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset;
- msg->outsize = sizeof(*params);
- msg->insize = sizeof(*resp);
- params = (struct ec_params_motion_sense *)msg->data;
- resp = (struct ec_response_motion_sense *)msg->data;
+ params = ec_buf;
+ resp = ec_buf;

for (i = 0; i < sensor_num; i++) {
params->cmd = MOTIONSENSE_CMD_INFO;
params->info.sensor_num = i;

- ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
+ ret = cros_ec_cmd(ec->ec_dev, 1,
+ EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset,
+ params, sizeof(*params), resp, sizeof(*resp),
+ NULL);
if (ret < 0) {
- dev_warn(dev, "no info for EC sensor %d : %d/%d\n",
- i, ret, msg->result);
+ dev_warn(dev, "no info for EC sensor %d : %d\n",
+ i, ret);
continue;
}

@@ -140,11 +137,10 @@ static int cros_ec_sensorhub_register(struct device *dev,
goto error;
}

- kfree(msg);
- return 0;
+ ret = 0;

error:
- kfree(msg);
+ kfree(ec_buf);
return ret;
}

--
2.25.0.341.g760bfbb309-goog