hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

platform/chrome: cros_ec_proto: Drop cros_ec_cmd_xfer() 

Since cros_ec_cmd_xfer_status() now returns Linux error codes and all
other files use that command, remove the now-unused function
cros_ec_cmd_xfer().

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
This commit is contained in:
Prashant Malani 2020-09-21 10:51:58 +02:00 committed by Enric Balletbo i Serra
parent 64b02e54e5
commit 6b194ee986
1 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/platform/chrome/cros_ec_proto.c
View File

@ -549,19 +549,22 @@ exit:
EXPORT_SYMBOL(cros_ec_query_all); EXPORT_SYMBOL(cros_ec_query_all);
/** /**
* cros_ec_cmd_xfer() - Send a command to the ChromeOS EC. * cros_ec_cmd_xfer_status() - Send a command to the ChromeOS EC.
* @ec_dev: EC device. * @ec_dev: EC device.
* @msg: Message to write. * @msg: Message to write.
* *
* Call this to send a command to the ChromeOS EC. This should be used * Call this to send a command to the ChromeOS EC. This should be used instead of calling the EC's
* instead of calling the EC's cmd_xfer() callback directly. * cmd_xfer() callback directly. It returns success status only if both the command was transmitted
* successfully and the EC replied with success status.
* *
* Return: 0 on success or negative error code. * Return:
* >=0 - The number of bytes transferred
* <0 - Linux error code
*/ */
static int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev, int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev,
struct cros_ec_command *msg) struct cros_ec_command *msg)
{ {
int ret; int ret, mapped;
mutex_lock(&ec_dev->lock); mutex_lock(&ec_dev->lock);
if (ec_dev->proto_version == EC_PROTO_VERSION_UNKNOWN) { if (ec_dev->proto_version == EC_PROTO_VERSION_UNKNOWN) {
@ -598,42 +601,17 @@ static int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev,
return -EMSGSIZE; return -EMSGSIZE;
} }
} }
ret = send_command(ec_dev, msg); ret = send_command(ec_dev, msg);
mutex_unlock(&ec_dev->lock); mutex_unlock(&ec_dev->lock);
return ret;
}
/**
* cros_ec_cmd_xfer_status() - Send a command to the ChromeOS EC.
* @ec_dev: EC device.
* @msg: Message to write.
*
* This function is identical to cros_ec_cmd_xfer, except it returns success
* status only if both the command was transmitted successfully and the EC
* replied with success status. It's not necessary to check msg->result when
* using this function.
*
* Return:
* >=0 - The number of bytes transferred
* <0 - Linux error code
*/
int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev,
struct cros_ec_command *msg)
{
int ret, mapped;
ret = cros_ec_cmd_xfer(ec_dev, msg);
if (ret < 0) {
dev_err(ec_dev->dev, "Command xfer error (err:%d)\n", ret);
return ret;
}
mapped = cros_ec_map_error(msg->result); mapped = cros_ec_map_error(msg->result);
if (mapped) { if (mapped) {
dev_dbg(ec_dev->dev, "Command result (err: %d [%d])\n", dev_dbg(ec_dev->dev, "Command result (err: %d [%d])\n",
msg->result, mapped); msg->result, mapped);
ret = mapped; ret = mapped;
} }
return ret; return ret;
} }
EXPORT_SYMBOL(cros_ec_cmd_xfer_status); EXPORT_SYMBOL(cros_ec_cmd_xfer_status);