summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-07-02 23:04:37 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-11-27 16:20:01 -0500
commitcea8d89d26adbd9729763d2914683467c16b7bd2 (patch)
treee26e4c88b2b5a41f108553e4a591056b5ec2ca1e
parent65cb3654889e0b748abc7756260ca267705aee14 (diff)
downloadlinux-crypto-cea8d89d26adbd9729763d2914683467c16b7bd2.tar.gz
linux-crypto-cea8d89d26adbd9729763d2914683467c16b7bd2.zip
crypto: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--crypto/af_alg.c4
-rw-r--r--crypto/algif_skcipher.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 85cea9de..a00a8171 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 9954b078..c86207f2 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,