summaryrefslogtreecommitdiff
path: root/sys/opencrypto
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-05-22 11:30:40 +0000
committerriastradh <riastradh@NetBSD.org>2022-05-22 11:30:40 +0000
commitba324fa817c370d15172bac9e88300c58fdb3605 (patch)
treea99f0b27714905d87d7ffbcb54cf9db2b3e90318 /sys/opencrypto
parent5dbb9986cd21164c64323fa33270e66cd1d073b8 (diff)
opencrypto: Make crp_callback, krp_callback return void.
Nothing uses the return values inside opencrypto, so let's stop making users return them.
Diffstat (limited to 'sys/opencrypto')
-rw-r--r--sys/opencrypto/cryptodev.c28
-rw-r--r--sys/opencrypto/cryptodev.h6
2 files changed, 15 insertions, 19 deletions
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index 413f5fc8a8d..e00ba38cceb 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.116 2022/05/22 11:29:54 riastradh Exp $ */
+/* $NetBSD: cryptodev.c,v 1.117 2022/05/22 11:30:41 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.116 2022/05/22 11:29:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.117 2022/05/22 11:30:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,11 +188,11 @@ static int cryptodev_key(struct crypt_kop *);
static int cryptodev_mkey(struct fcrypt *, struct crypt_n_kop *, int);
static int cryptodev_msessionfin(struct fcrypt *, int, u_int32_t *);
-static int cryptodev_cb(struct cryptop *);
-static int cryptodevkey_cb(struct cryptkop *);
+static void cryptodev_cb(struct cryptop *);
+static void cryptodevkey_cb(struct cryptkop *);
-static int cryptodev_mcb(struct cryptop *);
-static int cryptodevkey_mcb(struct cryptkop *);
+static void cryptodev_mcb(struct cryptop *);
+static void cryptodevkey_mcb(struct cryptkop *);
static int cryptodev_getmstatus(struct fcrypt *, struct crypt_result *,
int);
@@ -711,7 +711,7 @@ bail:
return error;
}
-static int
+static void
cryptodev_cb(struct cryptop *crp)
{
struct csession *cse = crp->crp_opaque;
@@ -720,7 +720,7 @@ cryptodev_cb(struct cryptop *crp)
if ((error = crp->crp_etype) == EAGAIN) {
error = crypto_dispatch(crp);
if (error == 0)
- return 0;
+ return;
}
mutex_enter(&cryptodev_mtx);
@@ -728,10 +728,9 @@ cryptodev_cb(struct cryptop *crp)
crp->crp_devflags |= CRYPTODEV_F_RET;
cv_signal(&crp->crp_cv);
mutex_exit(&cryptodev_mtx);
- return 0;
}
-static int
+static void
cryptodev_mcb(struct cryptop *crp)
{
struct csession *cse = crp->crp_opaque;
@@ -740,7 +739,7 @@ cryptodev_mcb(struct cryptop *crp)
if ((error = crp->crp_etype) == EAGAIN) {
error = crypto_dispatch(crp);
if (error == 0)
- return 0;
+ return;
}
mutex_enter(&cryptodev_mtx);
@@ -748,10 +747,9 @@ cryptodev_mcb(struct cryptop *crp)
TAILQ_INSERT_TAIL(&crp->fcrp->crp_ret_mq, crp, crp_next);
selnotify(&crp->fcrp->sinfo, 0, 0);
mutex_exit(&cryptodev_mtx);
- return 0;
}
-static int
+static void
cryptodevkey_cb(struct cryptkop *krp)
{
@@ -759,10 +757,9 @@ cryptodevkey_cb(struct cryptkop *krp)
krp->krp_devflags |= CRYPTODEV_F_RET;
cv_signal(&krp->krp_cv);
mutex_exit(&cryptodev_mtx);
- return 0;
}
-static int
+static void
cryptodevkey_mcb(struct cryptkop *krp)
{
@@ -771,7 +768,6 @@ cryptodevkey_mcb(struct cryptkop *krp)
TAILQ_INSERT_TAIL(&krp->fcrp->crp_ret_mkq, krp, krp_next);
selnotify(&krp->fcrp->sinfo, 0, 0);
mutex_exit(&cryptodev_mtx);
- return 0;
}
static int
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h
index 0b37ba0c6ae..d4d2f857875 100644
--- a/sys/opencrypto/cryptodev.h
+++ b/sys/opencrypto/cryptodev.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.h,v 1.45 2022/05/22 11:30:05 riastradh Exp $ */
+/* $NetBSD: cryptodev.h,v 1.46 2022/05/22 11:30:41 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -483,7 +483,7 @@ struct cryptop {
void * crp_opaque; /* Opaque pointer, passed along */
struct cryptodesc *crp_desc; /* Linked list of processing descriptors */
- int (*crp_callback)(struct cryptop *); /*
+ void (*crp_callback)(struct cryptop *); /*
* Callback function.
* That must not sleep as it is
* called in softint context.
@@ -538,7 +538,7 @@ struct cryptkop {
u_short krp_oparams; /* # of output parameters */
u_int32_t krp_hid;
struct crparam krp_param[CRK_MAXPARAM]; /* kvm */
- int (*krp_callback)(struct cryptkop *); /*
+ void (*krp_callback)(struct cryptkop *); /*
* Callback function.
* That must not sleep as it is
* called in softint context.