[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180717205712.29495-13-toddpoynor@gmail.com>
Date: Tue, 17 Jul 2018 13:56:52 -0700
From: Todd Poynor <toddpoynor@...il.com>
To: Rob Springer <rspringer@...gle.com>,
John Joseph <jnjoseph@...gle.com>,
Ben Chan <benchan@...omium.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Zhongze Hu <frankhu@...omium.org>, Simon Que <sque@...omium.org>,
Dmitry Torokhov <dtor@...omium.org>,
Guenter Roeck <groeck@...omium.org>,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Todd Poynor <toddpoynor@...gle.com>
Subject: [PATCH 12/32] staging: gasket: gasket_wait_with_reschedule simplify logic
From: Todd Poynor <toddpoynor@...gle.com>
gasket_wait_with_reschedule() is a little more clear if we just return
directly when the waited-for condition is hit. This also allows the
following condition check to be removed and identation of the
conditionally-executed code to be reduced.
Reported-by: Dmitry Torokhov <dtor@...omium.org>
Signed-off-by: Zhongze Hu <frankhu@...omium.org>
Signed-off-by: Todd Poynor <toddpoynor@...gle.com>
---
drivers/staging/gasket/gasket_core.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index 442543573f6e9..5ae3d44f6166e 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -2097,18 +2097,12 @@ int gasket_wait_with_reschedule(
while (retries < max_retries) {
tmp = gasket_dev_read_64(gasket_dev, bar, offset);
if ((tmp & mask) == val)
- break;
+ return 0;
msleep(delay_ms);
retries++;
}
- if (retries == max_retries) {
- gasket_log_error(
- gasket_dev,
- "%s timeout: reg %llx timeout (%llu ms)",
- __func__,
- offset, max_retries * delay_ms);
- return -ETIMEDOUT;
- }
- return 0;
+ gasket_log_error(gasket_dev, "%s timeout: reg %llx timeout (%llu ms)",
+ __func__, offset, max_retries * delay_ms);
+ return -ETIMEDOUT;
}
EXPORT_SYMBOL(gasket_wait_with_reschedule);
--
2.18.0.203.gfac676dfb9-goog
Powered by blists - more mailing lists