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) |
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); | |||
1054 | /** | 1054 | /** |
1055 | * af_alg_poll - poll system call handler | 1055 | * af_alg_poll - poll system call handler |
1056 | */ | 1056 | */ |
1057 | unsigned int af_alg_poll(struct file *file, struct socket *sock, | 1057 | __poll_t af_alg_poll(struct file *file, struct socket *sock, |
1058 | poll_table *wait) | 1058 | poll_table *wait) |
1059 | { | 1059 | { |
1060 | struct sock *sk = sock->sk; | 1060 | struct sock *sk = sock->sk; |
1061 | struct alg_sock *ask = alg_sk(sk); | 1061 | struct alg_sock *ask = alg_sk(sk); |
1062 | struct af_alg_ctx *ctx = ask->private; | 1062 | struct af_alg_ctx *ctx = ask->private; |
1063 | unsigned int mask; | 1063 | __poll_t mask; |
1064 | 1064 | ||
1065 | sock_poll_wait(file, sk_sleep(sk), wait); | 1065 | sock_poll_wait(file, sk_sleep(sk), wait); |
1066 | mask = 0; | 1066 | 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: | |||
186 | return ret; | 186 | return ret; |
187 | } | 187 | } |
188 | 188 | ||
189 | |||
190 | static struct proto_ops algif_skcipher_ops = { | 189 | static struct proto_ops algif_skcipher_ops = { |
191 | .family = PF_ALG, | 190 | .family = PF_ALG, |
192 | 191 | ||
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, | |||
243 | ssize_t af_alg_sendpage(struct socket *sock, struct page *page, | 243 | ssize_t af_alg_sendpage(struct socket *sock, struct page *page, |
244 | int offset, size_t size, int flags); | 244 | int offset, size_t size, int flags); |
245 | void af_alg_async_cb(struct crypto_async_request *_req, int err); | 245 | void af_alg_async_cb(struct crypto_async_request *_req, int err); |
246 | unsigned int af_alg_poll(struct file *file, struct socket *sock, | 246 | __poll_t af_alg_poll(struct file *file, struct socket *sock, |
247 | poll_table *wait); | 247 | poll_table *wait); |
248 | struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk, | 248 | struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk, |
249 | unsigned int areqlen); | 249 | unsigned int areqlen); |