UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

platform/chrome: cros_ec_proto: Fix check_features ret val 

The kerneldoc for cros_ec_check_features() states that it returns 1 or 0
depedending on whether a feature is supported or not, but it instead
returns a negative error number in one case, and a non-1 bitmask in
other cases.

Since all call-sites only check for a 1 or 0 return value, update
the function to return boolean values.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Link: https://lore.kernel.org/r/20210916014632.2662612-1-pmalani@chromium.org
This commit is contained in:
Prashant Malani 2021-09-15 18:46:27 -07:00 committed by Enric Balletbo i Serra
parent 5135b21392
commit d50497c4a0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,9 +808,9 @@ EXPORT_SYMBOL(cros_ec_get_host_event);
* *
* Call this function to test whether the ChromeOS EC supports a feature. * Call this function to test whether the ChromeOS EC supports a feature.
* *
* Return: 1 if supported, 0 if not * Return: true if supported, false if not (or if an error was encountered).
*/ */
int cros_ec_check_features(struct cros_ec_dev *ec, int feature) bool cros_ec_check_features(struct cros_ec_dev *ec, int feature)
{ {
struct cros_ec_command *msg; struct cros_ec_command *msg;
int ret; int ret;
@ -818,8 +818,10 @@ 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 = kzalloc(sizeof(*msg) + sizeof(ec->features), GFP_KERNEL);
if (!msg) if (!msg) {
return -ENOMEM; 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->command = EC_CMD_GET_FEATURES + ec->cmd_offset;
msg->insize = sizeof(ec->features); msg->insize = sizeof(ec->features);
@ -839,7 +841,7 @@ int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
kfree(msg); kfree(msg);
} }
return ec->features[feature / 32] & EC_FEATURE_MASK_0(feature); return !!(ec->features[feature / 32] & EC_FEATURE_MASK_0(feature));
} }
EXPORT_SYMBOL_GPL(cros_ec_check_features); EXPORT_SYMBOL_GPL(cros_ec_check_features);

2
include/linux/platform_data/cros_ec_proto.h
View File

@ -227,7 +227,7 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev,
u32 cros_ec_get_host_event(struct cros_ec_device *ec_dev); u32 cros_ec_get_host_event(struct cros_ec_device *ec_dev);
int cros_ec_check_features(struct cros_ec_dev *ec, int feature); bool cros_ec_check_features(struct cros_ec_dev *ec, int feature);
int cros_ec_get_sensor_count(struct cros_ec_dev *ec); int cros_ec_get_sensor_count(struct cros_ec_dev *ec);