Skip to content

Commit

Permalink
platform/chrome: cros_ec_proto: Use ec_command for check_features
Browse files Browse the repository at this point in the history
Use the existing cros_ec_command() for cros_ec_check_features(). This
eliminates an unnecessary duplication of the memory allocation/free and
memory copy code.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Link: https://lore.kernel.org/r/20211004170716.86601-2-pmalani@chromium.org
Signed-off-by: Benson Leung <bleung@chromium.org>
  • Loading branch information
Prashant Malani authored and Benson Leung committed Oct 31, 2021
1 parent 7ff2278 commit 297d34e
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions drivers/platform/chrome/cros_ec_proto.c
Original file line number Diff line number Diff line change
Expand Up @@ -813,33 +813,19 @@ EXPORT_SYMBOL(cros_ec_get_host_event);
bool cros_ec_check_features(struct cros_ec_dev *ec, int feature)
{
struct ec_response_get_features *features = &ec->features;
struct cros_ec_command *msg;
int ret;

if (features->flags[0] == -1U && features->flags[1] == -1U) {
/* features bitmap not read yet */
msg = kzalloc(sizeof(*msg) + sizeof(*features), GFP_KERNEL);
if (!msg) {
dev_err(ec->dev, "failed to allocate memory to get EC features\n");
return false;
}

msg->command = EC_CMD_GET_FEATURES + ec->cmd_offset;
msg->insize = sizeof(*features);

ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
ret = cros_ec_command(ec->ec_dev, 0, EC_CMD_GET_FEATURES + ec->cmd_offset,
NULL, 0, features, sizeof(*features));
if (ret < 0) {
dev_warn(ec->dev, "cannot get EC features: %d/%d\n",
ret, msg->result);
dev_warn(ec->dev, "cannot get EC features: %d\n", ret);
memset(features, 0, sizeof(*features));
} else {
memcpy(features, msg->data, sizeof(*features));
}

dev_dbg(ec->dev, "EC features %08x %08x\n",
features->flags[0], features->flags[1]);

kfree(msg);
}

return !!(features->flags[feature / 32] & EC_FEATURE_MASK_0(feature));
Expand Down

0 comments on commit 297d34e

Please sign in to comment.