Commit eaa6b010 authored by Dejin Zheng's avatar Dejin Zheng Committed by David S. Miller
Browse files

iopoll: redefined readx_poll_timeout macro to simplify the code 



redefined readx_poll_timeout macro by read_poll_timeout to
simplify the code.

Signed-off-by: default avatarDejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f5323a1

include/linux/iopoll.h

+1 −19
Original line number Diff line number Diff line
@@ -76,25 +76,7 @@ 
 * macros defined below rather than this macro directly.

 */

#define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us)	\

({ \

	u64 __timeout_us = (timeout_us); \

	unsigned long __sleep_us = (sleep_us); \

	ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \

	might_sleep_if((__sleep_us) != 0); \

	for (;;) { \

		(val) = op(addr); \

		if (cond) \

			break; \

		if (__timeout_us && \

		    ktime_compare(ktime_get(), __timeout) > 0) { \

			(val) = op(addr); \

			break; \

		} \

		if (__sleep_us) \

			usleep_range((__sleep_us >> 2) + 1, __sleep_us); \

	} \

	(cond) ? 0 : -ETIMEDOUT; \

})

	read_poll_timeout(op, val, cond, sleep_us, timeout_us, false, addr)



/**

 * readx_poll_timeout_atomic - Periodically poll an address until a condition is met or a timeout occurs