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 | |
| parent | c23e0cb81e4021b9712b1093d54713991fd9b7c2 (diff) | |
| download | linux-stable-afc9a42b7464f76e1388cad87d8543c69f6f74ed.tar.gz linux-stable-afc9a42b7464f76e1388cad87d8543c69f6f74ed.tar.bz2 linux-stable-afc9a42b7464f76e1388cad87d8543c69f6f74ed.zip | |
the rest of drivers/*: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/dma-buf')
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 4 | ||||
| -rw-r--r-- | drivers/dma-buf/sync_file.c | 2 |
2 files changed, 3 insertions, 3 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) spin_unlock_irqrestore(&dcb->poll->lock, flags); } -static unsigned int dma_buf_poll(struct file *file, poll_table *poll) +static __poll_t dma_buf_poll(struct file *file, poll_table *poll) { struct dma_buf *dmabuf; struct reservation_object *resv; @@ -195,7 +195,7 @@ retry: if (fence_excl && (!(events & POLLOUT) || shared_count == 0)) { struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_excl; - unsigned long pevents = POLLIN; + __poll_t pevents = POLLIN; if (shared_count == 0) pevents |= POLLOUT; diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 03830634e141..8e8c4a12a0bc 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -312,7 +312,7 @@ static int sync_file_release(struct inode *inode, struct file *file) return 0; } -static unsigned int sync_file_poll(struct file *file, poll_table *wait) +static __poll_t sync_file_poll(struct file *file, poll_table *wait) { struct sync_file *sync_file = file->private_data; |