[src/pgoyette-compat]: src/sys Fix some thinkos/pastos/typos

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e6da6cea50f2
branches:  pgoyette-compat
changeset: 830751:e6da6cea50f2
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Sep 23 03:44:04 2018 +0000

description:
Fix some thinkos/pastos/typos

diffstat:

 sys/dev/raidframe/rf_compat50.c       |   6 +++---
 sys/modules/compat_crypto_50/Makefile |   4 ++--
 sys/opencrypto/ocryptodev.c           |  17 +++++++++--------
 sys/opencrypto/ocryptodev.h           |   8 ++------
 4 files changed, 16 insertions(+), 19 deletions(-)

diffs (116 lines):

diff -r 3ac8dd745d94 -r e6da6cea50f2 sys/dev/raidframe/rf_compat50.c
--- a/sys/dev/raidframe/rf_compat50.c   Sun Sep 23 01:33:25 2018 +0000
+++ b/sys/dev/raidframe/rf_compat50.c   Sun Sep 23 03:44:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_compat50.c,v 1.3.2.5 2018/09/23 01:33:25 pgoyette Exp $     */
+/*     $NetBSD: rf_compat50.c,v 1.3.2.6 2018/09/23 03:44:04 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -264,10 +264,10 @@
 {
 
        switch (cmd) {
-       MODULE_CMD_INIT:
+       case MODULE_CMD_INIT:
                raidframe_50_init();
                return 0;
-       MODULE_CMD_FINI:
+       case MODULE_CMD_FINI:
                raidframe_50_fini();
                return 0;
        default:
diff -r 3ac8dd745d94 -r e6da6cea50f2 sys/modules/compat_crypto_50/Makefile
--- a/sys/modules/compat_crypto_50/Makefile     Sun Sep 23 01:33:25 2018 +0000
+++ b/sys/modules/compat_crypto_50/Makefile     Sun Sep 23 03:44:04 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.1 2018/09/23 01:33:26 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.1.2.2 2018/09/23 03:44:04 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -7,6 +7,6 @@
 .PATH: ${S}/opencrypto
 
 KMOD=  crypto
-SRCS=  ocryptodev.c ocryptodev.c
+SRCS=  ocryptodev.c
 
 .include <bsd.kmodule.mk>
diff -r 3ac8dd745d94 -r e6da6cea50f2 sys/opencrypto/ocryptodev.c
--- a/sys/opencrypto/ocryptodev.c       Sun Sep 23 01:33:25 2018 +0000
+++ b/sys/opencrypto/ocryptodev.c       Sun Sep 23 03:44:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $ */
+/*     $NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette 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 $   */
 
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -106,7 +106,8 @@
 static int     ocryptodev_mop(struct fcrypt *, struct ocrypt_n_op *, int,
                    struct lwp *);
 static int     ocryptodev_session(struct fcrypt *, struct osession_op *);
-static int     ocryptodev_msession(struct fcrypt *, struct osession_n_op *);
+static int     ocryptodev_msession(struct fcrypt *, struct osession_n_op *,
+                   int);
 
 int
 ocryptof_ioctl(struct file *fp, u_long cmd, void *data)
@@ -153,10 +154,10 @@
                kmem_free(osnop, osgop->count * sizeof(struct osession_n_op));
                break;
        case OCIOCCRYPT:
-               mutex_enter(mtx);
+               mutex_enter(&cryptodev_mtx);
                ocop = (struct ocrypt_op *)data;
-               cse = cryptodev_csefind)(fcr, ocop->ses);
-               mutex_exit(mtx);
+               cse = cryptodev_csefind(fcr, ocop->ses);
+               mutex_exit(&cryptodev_mtx);
                if (cse == NULL) {
                        DPRINTF("csefind failed\n");
                        return EINVAL;
@@ -310,10 +311,10 @@
 {
  
        switch (cmd) {
-       MODULE_CMD_INIT:
+       case MODULE_CMD_INIT:
                crypto_50_init();
                return 0;
-       MODULE_CMD_FINI:
+       case MODULE_CMD_FINI:
                crypto_50_fini();
                return 0;
        default: 
diff -r 3ac8dd745d94 -r e6da6cea50f2 sys/opencrypto/ocryptodev.h
--- a/sys/opencrypto/ocryptodev.h       Sun Sep 23 01:33:25 2018 +0000
+++ b/sys/opencrypto/ocryptodev.h       Sun Sep 23 03:44:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ocryptodev.h,v 1.3.16.3 2018/09/22 10:42:00 pgoyette Exp $ */
+/*     $NetBSD: ocryptodev.h,v 1.3.16.4 2018/09/23 03:44:04 pgoyette 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 $      */
 
@@ -176,11 +176,7 @@
 struct crypt_op;
 struct crypt_n_op;
 
-int ocryptof_ioctl(struct file *, u_long, void *, kmutex_t *,
-    int (*)(struct fcrypt *, struct session_op *),
-    int (*)(struct csession *, struct crypt_op *, struct lwp *),
-    int (*)(struct fcrypt *, struct crypt_n_op *, int, struct lwp *),
-    struct csession * (*)(struct fcrypt *, u_int32_t));
+int ocryptof_ioctl(struct file *, u_long, void *);
 
 void cryptodev_50_init(void);
 void cryptodev_50_fini(void);