Commit a42ea3d6 authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman
Browse files

staging: gasket: gasket_wait_with_reschedule simplify logic 



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: default avatarDmitry Torokhov <dtor@chromium.org>
Signed-off-by: default avatarZhongze Hu <frankhu@chromium.org>
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c17acfdf

drivers/staging/gasket/gasket_core.c

+4 −10
Original line number Diff line number Diff line
@@ -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);

	gasket_log_error(gasket_dev, "%s timeout: reg %llx timeout (%llu ms)",

			 __func__, offset, max_retries * delay_ms);

	return -ETIMEDOUT;

}

	return 0;

}

EXPORT_SYMBOL(gasket_wait_with_reschedule);