diff options
| author | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-04-15 17:35:06 -0400 |
|---|---|---|
| committer | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-04-17 04:20:42 -0400 |
| commit | 81f6ec233355be6898d99add553d27e31b4b7cd7 (patch) | |
| tree | 1f760eb2e5275b444589a82475c2b4abf62debba /drivers | |
| parent | 2de89fd989584c54f5f3fcea808504c0149ba837 (diff) | |
platform/chrome: cros_ec_debugfs: Use 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.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_debugfs.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c index a712508e4646..0bd163723548 100644 --- a/drivers/platform/chrome/cros_ec_debugfs.c +++ b/drivers/platform/chrome/cros_ec_debugfs.c | |||
| @@ -72,15 +72,9 @@ static void cros_ec_console_log_work(struct work_struct *__work) | |||
| 72 | int buf_space; | 72 | int buf_space; |
| 73 | int ret; | 73 | int ret; |
| 74 | 74 | ||
| 75 | ret = cros_ec_cmd_xfer(ec->ec_dev, &snapshot_msg); | 75 | ret = cros_ec_cmd_xfer_status(ec->ec_dev, &snapshot_msg); |
| 76 | if (ret < 0) { | 76 | if (ret < 0) |
| 77 | dev_err(ec->dev, "EC communication failed\n"); | ||
| 78 | goto resched; | ||
| 79 | } | ||
| 80 | if (snapshot_msg.result != EC_RES_SUCCESS) { | ||
| 81 | dev_err(ec->dev, "EC failed to snapshot the console log\n"); | ||
| 82 | goto resched; | 77 | goto resched; |
| 83 | } | ||
| 84 | 78 | ||
| 85 | /* Loop until we have read everything, or there's an error. */ | 79 | /* Loop until we have read everything, or there's an error. */ |
| 86 | mutex_lock(&debug_info->log_mutex); | 80 | mutex_lock(&debug_info->log_mutex); |
| @@ -95,16 +89,10 @@ static void cros_ec_console_log_work(struct work_struct *__work) | |||
| 95 | 89 | ||
| 96 | memset(read_params, '\0', sizeof(*read_params)); | 90 | memset(read_params, '\0', sizeof(*read_params)); |
| 97 | read_params->subcmd = CONSOLE_READ_RECENT; | 91 | read_params->subcmd = CONSOLE_READ_RECENT; |
| 98 | ret = cros_ec_cmd_xfer(ec->ec_dev, debug_info->read_msg); | 92 | ret = cros_ec_cmd_xfer_status(ec->ec_dev, |
| 99 | if (ret < 0) { | 93 | debug_info->read_msg); |
| 100 | dev_err(ec->dev, "EC communication failed\n"); | 94 | if (ret < 0) |
| 101 | break; | ||
| 102 | } | ||
| 103 | if (debug_info->read_msg->result != EC_RES_SUCCESS) { | ||
| 104 | dev_err(ec->dev, | ||
| 105 | "EC failed to read the console log\n"); | ||
| 106 | break; | 95 | break; |
| 107 | } | ||
| 108 | 96 | ||
| 109 | /* If the buffer is empty, we're done here. */ | 97 | /* If the buffer is empty, we're done here. */ |
| 110 | if (ret == 0 || ec_buffer[0] == '\0') | 98 | if (ret == 0 || ec_buffer[0] == '\0') |
| @@ -290,9 +278,8 @@ static int ec_read_version_supported(struct cros_ec_dev *ec) | |||
| 290 | params->cmd = EC_CMD_CONSOLE_READ; | 278 | params->cmd = EC_CMD_CONSOLE_READ; |
| 291 | response = (struct ec_response_get_cmd_versions *)msg->data; | 279 | response = (struct ec_response_get_cmd_versions *)msg->data; |
| 292 | 280 | ||
| 293 | ret = cros_ec_cmd_xfer(ec->ec_dev, msg) >= 0 && | 281 | ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg) >= 0 && |
| 294 | msg->result == EC_RES_SUCCESS && | 282 | response->version_mask & EC_VER_MASK(1); |
| 295 | (response->version_mask & EC_VER_MASK(1)); | ||
| 296 | 283 | ||
| 297 | kfree(msg); | 284 | kfree(msg); |
| 298 | 285 | ||
| @@ -372,9 +359,8 @@ static int cros_ec_create_panicinfo(struct cros_ec_debugfs *debug_info) | |||
| 372 | msg->command = EC_CMD_GET_PANIC_INFO; | 359 | msg->command = EC_CMD_GET_PANIC_INFO; |
| 373 | msg->insize = insize; | 360 | msg->insize = insize; |
| 374 | 361 | ||
| 375 | ret = cros_ec_cmd_xfer(ec_dev, msg); | 362 | ret = cros_ec_cmd_xfer_status(ec_dev, msg); |
| 376 | if (ret < 0) { | 363 | if (ret < 0) { |
| 377 | dev_warn(debug_info->ec->dev, "Cannot read panicinfo.\n"); | ||
| 378 | ret = 0; | 364 | ret = 0; |
| 379 | goto free; | 365 | goto free; |
| 380 | } | 366 | } |
