[PATCH linux dev-4.10 v2 8/9] drivers/hwmon/occ: Remove repeated ops for OCC command in progress
Eddie James
eajames at linux.vnet.ibm.com
Sat Sep 30 08:41:07 AEST 2017
From: "Edward A. James" <eajames at us.ibm.com>
This is now handled in the occ driver.
Signed-off-by: Edward A. James <eajames at us.ibm.com>
---
drivers/hwmon/occ/p9_sbe.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/hwmon/occ/p9_sbe.c b/drivers/hwmon/occ/p9_sbe.c
index 2d50a94..c7e0d9c 100644
--- a/drivers/hwmon/occ/p9_sbe.c
+++ b/drivers/hwmon/occ/p9_sbe.c
@@ -26,14 +26,10 @@ struct p9_sbe_occ {
static int p9_sbe_occ_send_cmd(struct occ *occ, u8 *cmd)
{
int rc, error;
- unsigned long start;
struct occ_client *client;
struct occ_response *resp = &occ->resp;
struct p9_sbe_occ *p9_sbe_occ = to_p9_sbe_occ(occ);
- start = jiffies;
-
-retry:
client = occ_drv_open(p9_sbe_occ->sbe, 0);
if (!client) {
rc = -ENODEV;
@@ -52,15 +48,7 @@ static int p9_sbe_occ_send_cmd(struct occ *occ, u8 *cmd)
switch (resp->return_status) {
case RESP_RETURN_CMD_IN_PRG:
- if (time_after(jiffies,
- start + msecs_to_jiffies(OCC_TIMEOUT_MS)))
- rc = -EALREADY;
- else {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(msecs_to_jiffies(OCC_CMD_IN_PRG_MS));
-
- goto retry;
- }
+ rc = -ETIMEDOUT;
break;
case RESP_RETURN_SUCCESS:
occ_reset_error(occ);
--
1.8.3.1
More information about the openbmc
mailing list