diff options
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/timers.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/timers.h b/drivers/gpu/nvgpu/include/nvgpu/timers.h index e46982c9..0ecbc183 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/timers.h +++ b/drivers/gpu/nvgpu/include/nvgpu/timers.h | |||
@@ -74,21 +74,21 @@ struct nvgpu_timeout { | |||
74 | 74 | ||
75 | int nvgpu_timeout_init(struct gk20a *g, struct nvgpu_timeout *timeout, | 75 | int nvgpu_timeout_init(struct gk20a *g, struct nvgpu_timeout *timeout, |
76 | int duration, unsigned long flags); | 76 | int duration, unsigned long flags); |
77 | int nvgpu_timeout_peek(struct nvgpu_timeout *timeout); | 77 | int nvgpu_timeout_peek_expired(struct nvgpu_timeout *timeout); |
78 | 78 | ||
79 | #define nvgpu_timeout_check(__timeout) \ | 79 | #define nvgpu_timeout_expired(__timeout) \ |
80 | __nvgpu_timeout_check_msg(__timeout, \ | 80 | __nvgpu_timeout_expired_msg(__timeout, \ |
81 | __builtin_return_address(0), "") | 81 | __builtin_return_address(0), "") |
82 | 82 | ||
83 | #define nvgpu_timeout_check_msg(__timeout, fmt, args...) \ | 83 | #define nvgpu_timeout_expired_msg(__timeout, fmt, args...) \ |
84 | __nvgpu_timeout_check_msg(__timeout, \ | 84 | __nvgpu_timeout_expired_msg(__timeout, \ |
85 | __builtin_return_address(0), \ | 85 | __builtin_return_address(0), \ |
86 | fmt, ##args) | 86 | fmt, ##args) |
87 | 87 | ||
88 | /* | 88 | /* |
89 | * Don't use this directly. | 89 | * Don't use this directly. |
90 | */ | 90 | */ |
91 | int __nvgpu_timeout_check_msg(struct nvgpu_timeout *timeout, | 91 | int __nvgpu_timeout_expired_msg(struct nvgpu_timeout *timeout, |
92 | void *caller, const char *fmt, ...); | 92 | void *caller, const char *fmt, ...); |
93 | 93 | ||
94 | #endif | 94 | #endif |