From: Prashant Malani <pmalani@chromium.org>
To: enric.balletbo@collabora.com, bleung@chromium.org
Cc: linux-kernel@vger.kernel.org, Prashant Malani <pmalani@chromium.org>
Subject: [PATCH 2/4] platform/chrome: Make chardev use send_cmd_msg
Date: Fri, 24 Jan 2020 17:21:05 -0800 [thread overview]
Message-ID: <20200125012105.59903-3-pmalani@chromium.org> (raw)
In-Reply-To: <20200125012105.59903-1-pmalani@chromium.org>
Update the Chrome OS character device driver to use the newly introduced
cros_ec_send_cmd_msg() wrapper instead of cros_ec_cmd_xfer_status(),
thus avoiding message buffer set up work which is already done by the
wrapper.
Signed-off-by: Prashant Malani <pmalani@chromium.org>
---
drivers/platform/chrome/cros_ec_chardev.c | 33 ++++++++---------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_chardev.c b/drivers/platform/chrome/cros_ec_chardev.c
index 74ded441bb500..0c43f59184acb 100644
--- a/drivers/platform/chrome/cros_ec_chardev.c
+++ b/drivers/platform/chrome/cros_ec_chardev.c
@@ -57,37 +57,26 @@ static int ec_get_version(struct cros_ec_dev *ec, char *str, int maxlen)
static const char * const current_image_name[] = {
"unknown", "read-only", "read-write", "invalid",
};
- struct ec_response_get_version *resp;
- struct cros_ec_command *msg;
+ struct ec_response_get_version resp = {0};
int ret;
- msg = kzalloc(sizeof(*msg) + sizeof(*resp), GFP_KERNEL);
- if (!msg)
- return -ENOMEM;
-
- msg->command = EC_CMD_GET_VERSION + ec->cmd_offset;
- msg->insize = sizeof(*resp);
-
- ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
+ ret = cros_ec_send_cmd_msg(ec->ec_dev, 0,
+ ec->cmd_offset + EC_CMD_GET_VERSION, NULL, 0,
+ &resp, sizeof(resp));
if (ret < 0) {
snprintf(str, maxlen,
- "Unknown EC version, returned error: %d\n",
- msg->result);
- goto exit;
+ "Unknown EC version, returned error: %d\n", ret);
+ return ret;
}
- resp = (struct ec_response_get_version *)msg->data;
- if (resp->current_image >= ARRAY_SIZE(current_image_name))
- resp->current_image = 3; /* invalid */
+ if (resp.current_image >= ARRAY_SIZE(current_image_name))
+ resp.current_image = 3; /* invalid */
snprintf(str, maxlen, "%s\n%s\n%s\n%s\n", CROS_EC_DEV_VERSION,
- resp->version_string_ro, resp->version_string_rw,
- current_image_name[resp->current_image]);
+ resp.version_string_ro, resp.version_string_rw,
+ current_image_name[resp.current_image]);
- ret = 0;
-exit:
- kfree(msg);
- return ret;
+ return 0;
}
static int cros_ec_chardev_mkbp_event(struct notifier_block *nb,
--
2.25.0.341.g760bfbb309-goog
next prev parent reply other threads:[~2020-01-25 1:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-25 1:21 [PATCH 0/4] Factor out cmd_xfer_status() setup code Prashant Malani
2020-01-25 1:21 ` [PATCH 1/4] platform/chrome: Add EC command msg wrapper Prashant Malani
2020-01-27 15:29 ` Enric Balletbo i Serra
2020-01-27 17:11 ` Prashant Malani
2020-01-27 20:35 ` Enric Balletbo Serra
2020-01-28 19:29 ` Prashant Malani
2020-01-28 20:57 ` Enric Balletbo Serra
2020-01-28 22:44 ` Prashant Malani
[not found] ` <CACeCKaewsKMLbO=N2hY5Gen075ZuVmSb8A=A1gQ7SWFvoF7M2w@mail.gmail.com>
2020-01-30 20:38 ` Prashant Malani
2020-01-25 1:21 ` Prashant Malani [this message]
2020-01-25 1:21 ` [PATCH 3/4] platform/chrome: Use send_cmd_msg in debugfs Prashant Malani
2020-01-25 1:21 ` [PATCH 4/4] platform/chrome: Make check_features() use wrapper Prashant Malani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200125012105.59903-3-pmalani@chromium.org \
--to=pmalani@chromium.org \
--cc=bleung@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).