diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-02 23:04:37 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-27 16:20:01 -0500 |
| commit | 38544bfff2f215030935189873f87a400bb0bf03 (patch) | |
| tree | d9a378661ace1755806b559e6b22c7046332dc11 | |
| parent | 1771e70a2ea40f01433de656195d85cc7732ead0 (diff) | |
| download | linux-38544bfff2f215030935189873f87a400bb0bf03.tar.gz linux-38544bfff2f215030935189873f87a400bb0bf03.tar.bz2 linux-38544bfff2f215030935189873f87a400bb0bf03.zip | |
crypto: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | crypto/af_alg.c | 4 | ||||
| -rw-r--r-- | crypto/algif_skcipher.c | 1 | ||||
| -rw-r--r-- | include/crypto/if_alg.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 85cea9de324a..a00a8171b4f6 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -1054,13 +1054,13 @@ EXPORT_SYMBOL_GPL(af_alg_async_cb); /** * af_alg_poll - poll system call handler */ -unsigned int af_alg_poll(struct file *file, struct socket *sock, +__poll_t af_alg_poll(struct file *file, struct socket *sock, poll_table *wait) { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); struct af_alg_ctx *ctx = ask->private; - unsigned int mask; + __poll_t mask; sock_poll_wait(file, sk_sleep(sk), wait); mask = 0; diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 9954b078f0b9..c86207f267e2 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -186,7 +186,6 @@ out: return ret; } - static struct proto_ops algif_skcipher_ops = { .family = PF_ALG, diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index 6abf0a3604dc..c670b30e405a 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -243,7 +243,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, ssize_t af_alg_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags); void af_alg_async_cb(struct crypto_async_request *_req, int err); -unsigned int af_alg_poll(struct file *file, struct socket *sock, +__poll_t af_alg_poll(struct file *file, struct socket *sock, poll_table *wait); struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk, unsigned int areqlen); |