diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-03 06:39:46 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-28 11:06:58 -0500 |
commit | afc9a42b7464f76e1388cad87d8543c69f6f74ed (patch) | |
tree | abc3abe50053edd3dcf0b04c2d2a63640ee89f6b /drivers/dma-buf/dma-buf.c | |
parent | c23e0cb81e4021b9712b1093d54713991fd9b7c2 (diff) |
the rest of drivers/*: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/dma-buf/dma-buf.c')
-rw-r--r-- | drivers/dma-buf/dma-buf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 4f313593caf5..12b62d0aac27 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c | |||
@@ -157,7 +157,7 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) | |||
157 | spin_unlock_irqrestore(&dcb->poll->lock, flags); | 157 | spin_unlock_irqrestore(&dcb->poll->lock, flags); |
158 | } | 158 | } |
159 | 159 | ||
160 | static unsigned int dma_buf_poll(struct file *file, poll_table *poll) | 160 | static __poll_t dma_buf_poll(struct file *file, poll_table *poll) |
161 | { | 161 | { |
162 | struct dma_buf *dmabuf; | 162 | struct dma_buf *dmabuf; |
163 | struct reservation_object *resv; | 163 | struct reservation_object *resv; |
@@ -195,7 +195,7 @@ retry: | |||
195 | 195 | ||
196 | if (fence_excl && (!(events & POLLOUT) || shared_count == 0)) { | 196 | if (fence_excl && (!(events & POLLOUT) || shared_count == 0)) { |
197 | struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_excl; | 197 | struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_excl; |
198 | unsigned long pevents = POLLIN; | 198 | __poll_t pevents = POLLIN; |
199 | 199 | ||
200 | if (shared_count == 0) | 200 | if (shared_count == 0) |
201 | pevents |= POLLOUT; | 201 | pevents |= POLLOUT; |