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/misc/mic/scif/scif_api.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/misc/mic/scif/scif_api.c')
-rw-r--r-- | drivers/misc/mic/scif/scif_api.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/misc/mic/scif/scif_api.c b/drivers/misc/mic/scif/scif_api.c index ddc9e4b08b5c..8a3e48ec37dd 100644 --- a/drivers/misc/mic/scif/scif_api.c +++ b/drivers/misc/mic/scif/scif_api.c | |||
@@ -1311,10 +1311,10 @@ static inline void _scif_poll_wait(struct file *f, wait_queue_head_t *wq, | |||
1311 | spin_lock(&ep->lock); | 1311 | spin_lock(&ep->lock); |
1312 | } | 1312 | } |
1313 | 1313 | ||
1314 | unsigned int | 1314 | __poll_t |
1315 | __scif_pollfd(struct file *f, poll_table *wait, struct scif_endpt *ep) | 1315 | __scif_pollfd(struct file *f, poll_table *wait, struct scif_endpt *ep) |
1316 | { | 1316 | { |
1317 | unsigned int mask = 0; | 1317 | __poll_t mask = 0; |
1318 | 1318 | ||
1319 | dev_dbg(scif_info.mdev.this_device, | 1319 | dev_dbg(scif_info.mdev.this_device, |
1320 | "SCIFAPI pollfd: ep %p %s\n", ep, scif_ep_states[ep->state]); | 1320 | "SCIFAPI pollfd: ep %p %s\n", ep, scif_ep_states[ep->state]); |
@@ -1389,7 +1389,8 @@ scif_poll(struct scif_pollepd *ufds, unsigned int nfds, long timeout_msecs) | |||
1389 | { | 1389 | { |
1390 | struct poll_wqueues table; | 1390 | struct poll_wqueues table; |
1391 | poll_table *pt; | 1391 | poll_table *pt; |
1392 | int i, mask, count = 0, timed_out = timeout_msecs == 0; | 1392 | int i, count = 0, timed_out = timeout_msecs == 0; |
1393 | __poll_t mask; | ||
1393 | u64 timeout = timeout_msecs < 0 ? MAX_SCHEDULE_TIMEOUT | 1394 | u64 timeout = timeout_msecs < 0 ? MAX_SCHEDULE_TIMEOUT |
1394 | : msecs_to_jiffies(timeout_msecs); | 1395 | : msecs_to_jiffies(timeout_msecs); |
1395 | 1396 | ||