diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-08-17 12:30:00 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-08-17 12:30:00 -0700 |
| commit | 93fbff1197474d7b65e598c6f48fa82a5c334539 (patch) | |
| tree | 0ae3e5a39bf0403b893979dfac75ca26356646e5 /include/linux/wait.h | |
| parent | Input: applespi - use correct struct names in comment (diff) | |
| parent | i2c: Make remove callback return void (diff) | |
| download | linux-dev-93fbff1197474d7b65e598c6f48fa82a5c334539.tar.xz linux-dev-93fbff1197474d7b65e598c6f48fa82a5c334539.zip | |
Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into next
Sync up with the latest I2C code base to get updated prototype of I2C
bus remove() method.
Diffstat (limited to 'include/linux/wait.h')
| -rw-r--r-- | include/linux/wait.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 851e07da2583..58cfbf81447c 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -544,10 +544,11 @@ do { \ \ hrtimer_init_sleeper_on_stack(&__t, CLOCK_MONOTONIC, \ HRTIMER_MODE_REL); \ - if ((timeout) != KTIME_MAX) \ - hrtimer_start_range_ns(&__t.timer, timeout, \ - current->timer_slack_ns, \ - HRTIMER_MODE_REL); \ + if ((timeout) != KTIME_MAX) { \ + hrtimer_set_expires_range_ns(&__t.timer, timeout, \ + current->timer_slack_ns); \ + hrtimer_sleeper_start_expires(&__t, HRTIMER_MODE_REL); \ + } \ \ __ret = ___wait_event(wq_head, condition, state, 0, 0, \ if (!__t.task) { \ |