Messages in this thread Patch in this message | | | From | "Matthew Wilcox (Oracle)" <> | Subject | [PATCH 11/19] wait: Parameterize the return variable to __wait_event_lock_irq_timeout() | Date | Wed, 2 Mar 2022 04:34:43 +0000 |
| |
Macros should not refer to variables which aren't in their arguments. Pass the name from both its callers.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/wait.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/include/linux/wait.h b/include/linux/wait.h index 524e0d1690a4..757285a04c88 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -1109,7 +1109,7 @@ do { \ __ret; \ }) -#define __wait_event_lock_irq_timeout(wq_head, condition, lock, timeout, state) \ +#define __wait_event_lock_irq_timeout(wq_head, condition, lock, timeout, state, __ret) \ ___wait_event(wq_head, ___wait_cond_timeout(condition, __ret), \ state, 0, timeout, \ spin_unlock_irq(&lock); \ @@ -1140,25 +1140,25 @@ do { \ * was interrupted by a signal, and the remaining jiffies otherwise * if the condition evaluated to true before the timeout elapsed. */ -#define wait_event_interruptible_lock_irq_timeout(wq_head, condition, lock, \ - timeout) \ -({ \ - long __ret = timeout; \ - if (!___wait_cond_timeout(condition, __ret)) \ - __ret = __wait_event_lock_irq_timeout( \ - wq_head, condition, lock, timeout, \ - TASK_INTERRUPTIBLE); \ - __ret; \ +#define wait_event_interruptible_lock_irq_timeout(wq_head, condition, lock, \ + timeout) \ +({ \ + long __ret = timeout; \ + if (!___wait_cond_timeout(condition, __ret)) \ + __ret = __wait_event_lock_irq_timeout( \ + wq_head, condition, lock, timeout, \ + TASK_INTERRUPTIBLE, __ret); \ + __ret; \ }) -#define wait_event_lock_irq_timeout(wq_head, condition, lock, timeout) \ -({ \ - long __ret = timeout; \ - if (!___wait_cond_timeout(condition, __ret)) \ - __ret = __wait_event_lock_irq_timeout( \ - wq_head, condition, lock, timeout, \ - TASK_UNINTERRUPTIBLE); \ - __ret; \ +#define wait_event_lock_irq_timeout(wq_head, condition, lock, timeout) \ +({ \ + long __ret = timeout; \ + if (!___wait_cond_timeout(condition, __ret)) \ + __ret = __wait_event_lock_irq_timeout( \ + wq_head, condition, lock, timeout, \ + TASK_UNINTERRUPTIBLE, __ret); \ + __ret; \ }) /* -- 2.34.1
| |