Commit 5156fb75 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Lee Jones

mfd: cros_ec: Use kzalloc and cros_ec_cmd_xfer_status helper

This patch makes use of cros_ec_cmd_xfer_status() instead of
cros_ec_cmd_xfer() so we can remove some redundant code. It also uses
kzalloc instead of kmalloc so we can remove more redundant code.
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarGwendal Grignou <gwendal@chromium.org>
Tested-by: default avatarGwendal Grignou <gwendal@chromium.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 840d9f13
...@@ -30,18 +30,15 @@ static int cros_ec_check_features(struct cros_ec_dev *ec, int feature) ...@@ -30,18 +30,15 @@ static int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
if (ec->features[0] == -1U && ec->features[1] == -1U) { if (ec->features[0] == -1U && ec->features[1] == -1U) {
/* features bitmap not read yet */ /* features bitmap not read yet */
msg = kzalloc(sizeof(*msg) + sizeof(ec->features), GFP_KERNEL);
msg = kmalloc(sizeof(*msg) + sizeof(ec->features), GFP_KERNEL);
if (!msg) if (!msg)
return -ENOMEM; return -ENOMEM;
msg->version = 0;
msg->command = EC_CMD_GET_FEATURES + ec->cmd_offset; msg->command = EC_CMD_GET_FEATURES + ec->cmd_offset;
msg->insize = sizeof(ec->features); msg->insize = sizeof(ec->features);
msg->outsize = 0;
ret = cros_ec_cmd_xfer(ec->ec_dev, msg); ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
if (ret < 0 || msg->result != EC_RES_SUCCESS) { if (ret < 0) {
dev_warn(ec->dev, "cannot get EC features: %d/%d\n", dev_warn(ec->dev, "cannot get EC features: %d/%d\n",
ret, msg->result); ret, msg->result);
memset(ec->features, 0, sizeof(ec->features)); memset(ec->features, 0, sizeof(ec->features));
...@@ -90,8 +87,8 @@ static void cros_ec_sensors_register(struct cros_ec_dev *ec) ...@@ -90,8 +87,8 @@ static void cros_ec_sensors_register(struct cros_ec_dev *ec)
params = (struct ec_params_motion_sense *)msg->data; params = (struct ec_params_motion_sense *)msg->data;
params->cmd = MOTIONSENSE_CMD_DUMP; params->cmd = MOTIONSENSE_CMD_DUMP;
ret = cros_ec_cmd_xfer(ec->ec_dev, msg); ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
if (ret < 0 || msg->result != EC_RES_SUCCESS) { if (ret < 0) {
dev_warn(ec->dev, "cannot get EC sensor information: %d/%d\n", dev_warn(ec->dev, "cannot get EC sensor information: %d/%d\n",
ret, msg->result); ret, msg->result);
goto error; goto error;
...@@ -118,8 +115,8 @@ static void cros_ec_sensors_register(struct cros_ec_dev *ec) ...@@ -118,8 +115,8 @@ static void cros_ec_sensors_register(struct cros_ec_dev *ec)
for (i = 0; i < sensor_num; i++) { for (i = 0; i < sensor_num; i++) {
params->cmd = MOTIONSENSE_CMD_INFO; params->cmd = MOTIONSENSE_CMD_INFO;
params->info.sensor_num = i; params->info.sensor_num = i;
ret = cros_ec_cmd_xfer(ec->ec_dev, msg); ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
if (ret < 0 || msg->result != EC_RES_SUCCESS) { if (ret < 0) {
dev_warn(ec->dev, "no info for EC sensor %d : %d/%d\n", dev_warn(ec->dev, "no info for EC sensor %d : %d/%d\n",
i, ret, msg->result); i, ret, msg->result);
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment