Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (ibmaem) match return type of wait_for_completion_timeout 

Return type of wait_for_completion_timeout is unsigned long not int.
Check its return value inline instead of introducing a throw-away
variable.

Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Qiushi Wu <qiushi@linux.ibm.com>
Link: https://lore.kernel.org/r/20250613182413.1426367-1-qiushi@linux.ibm.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Qiushi Wu 2025-06-13 14:24:13 -04:00 committed by Guenter Roeck
parent 6e253295e9
commit 36b0fef0b5
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/hwmon/ibmaem.c
View File

@ -349,7 +349,7 @@ static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg, static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
void *buf, size_t size) void *buf, size_t size)
{ {
int rs_size, res; int rs_size;
struct aem_read_sensor_req rs_req; struct aem_read_sensor_req rs_req;
/* Use preallocated rx buffer */ /* Use preallocated rx buffer */
struct aem_read_sensor_resp *rs_resp = data->rs_resp; struct aem_read_sensor_resp *rs_resp = data->rs_resp;
@ -383,17 +383,12 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
aem_send_message(ipmi); aem_send_message(ipmi);
res = wait_for_completion_timeout(&ipmi->read_complete, IPMI_TIMEOUT); if (!wait_for_completion_timeout(&ipmi->read_complete, IPMI_TIMEOUT))
if (!res) { return -ETIMEDOUT;
res = -ETIMEDOUT;
goto out;
}
if (ipmi->rx_result || ipmi->rx_msg_len != rs_size || if (ipmi->rx_result || ipmi->rx_msg_len != rs_size ||
memcmp(&rs_resp->id, &system_x_id, sizeof(system_x_id))) { memcmp(&rs_resp->id, &system_x_id, sizeof(system_x_id)))
res = -ENOENT; return -ENOENT;
goto out;
}
switch (size) { switch (size) {
case 1: { case 1: {
@ -417,10 +412,8 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
break; break;
} }
} }
res = 0;
out: return 0;
return res;
} }
/* Update AEM energy registers */ /* Update AEM energy registers */
@ -491,7 +484,6 @@ static void aem_delete(struct aem_data *data)
/* Retrieve version and module handle for an AEM1 instance */ /* Retrieve version and module handle for an AEM1 instance */
static int aem_find_aem1_count(struct aem_ipmi_data *data) static int aem_find_aem1_count(struct aem_ipmi_data *data)
{ {
int res;
struct aem_find_firmware_req ff_req; struct aem_find_firmware_req ff_req;
struct aem_find_firmware_resp ff_resp; struct aem_find_firmware_resp ff_resp;
@ -508,8 +500,7 @@ static int aem_find_aem1_count(struct aem_ipmi_data *data)
aem_send_message(data); aem_send_message(data);
res = wait_for_completion_timeout(&data->read_complete, IPMI_TIMEOUT); if (!wait_for_completion_timeout(&data->read_complete, IPMI_TIMEOUT))
if (!res)
return -ETIMEDOUT; return -ETIMEDOUT;
if (data->rx_result || data->rx_msg_len != sizeof(ff_resp) || if (data->rx_result || data->rx_msg_len != sizeof(ff_resp) ||
@ -632,7 +623,6 @@ static int aem_find_aem2(struct aem_ipmi_data *data,
struct aem_find_instance_resp *fi_resp, struct aem_find_instance_resp *fi_resp,
int instance_num) int instance_num)
{ {
int res;
struct aem_find_instance_req fi_req; struct aem_find_instance_req fi_req;
fi_req.id = system_x_id; fi_req.id = system_x_id;
@ -648,8 +638,7 @@ static int aem_find_aem2(struct aem_ipmi_data *data,
aem_send_message(data); aem_send_message(data);
res = wait_for_completion_timeout(&data->read_complete, IPMI_TIMEOUT); if (!wait_for_completion_timeout(&data->read_complete, IPMI_TIMEOUT))
if (!res)
return -ETIMEDOUT; return -ETIMEDOUT;
if (data->rx_result || data->rx_msg_len != sizeof(*fi_resp) || if (data->rx_result || data->rx_msg_len != sizeof(*fi_resp) ||