[src/trunk]: src/sys/dev/wscons Remove dying ftom vb_args and use sc_dying in...

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

details:   https://anonhg.NetBSD.org/src/rev/5ee0f77060d2
branches:  trunk
changeset: 824646:5ee0f77060d2
user:      nat <nat%NetBSD.org@localhost>
date:      Tue Jun 13 00:49:05 2017 +0000

description:
Remove dying ftom vb_args and use sc_dying instead.

diffstat:

 sys/dev/wscons/wsbell.c    |  9 ++++-----
 sys/dev/wscons/wsbellvar.h |  3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 40eac6443542 -r 5ee0f77060d2 sys/dev/wscons/wsbell.c
--- a/sys/dev/wscons/wsbell.c   Tue Jun 13 00:42:27 2017 +0000
+++ b/sys/dev/wscons/wsbell.c   Tue Jun 13 00:49:05 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsbell.c,v 1.5 2017/06/13 00:42:27 nat Exp $ */
+/* $NetBSD: wsbell.c,v 1.6 2017/06/13 00:49:05 nat Exp $ */
 
 /*-
  * Copyright (c) 2017 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.5 2017/06/13 00:42:27 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.6 2017/06/13 00:49:05 nat Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "wsmux.h"
@@ -305,7 +305,7 @@
        vdevgone(maj, mn, mn, VCHR);
 
        mutex_enter(&sc->sc_bellock);
-       sc->sc_bell_args.dying = true;
+       sc->sc_dying = 1;
 
        cv_broadcast(&sc->sc_bellcv);
        mutex_exit(&sc->sc_bellock);
@@ -400,7 +400,7 @@
                mutex_enter(&sc->sc_bellock);
                cv_wait_sig(&sc->sc_bellcv, &sc->sc_bellock);
                
-               if (vb->dying == true) {
+               if (sc->sc_dying) {
                        mutex_exit(&sc->sc_bellock);
                        kthread_exit(0);
                }
@@ -423,7 +423,6 @@
 {
 
        mutex_enter(&sc->sc_bellock);
-       sc->sc_bell_args.dying = false;
        sc->sc_bell_args.pitch = pitch;
        sc->sc_bell_args.period = period / 5;
        sc->sc_bell_args.volume = volume;
diff -r 40eac6443542 -r 5ee0f77060d2 sys/dev/wscons/wsbellvar.h
--- a/sys/dev/wscons/wsbellvar.h        Tue Jun 13 00:42:27 2017 +0000
+++ b/sys/dev/wscons/wsbellvar.h        Tue Jun 13 00:49:05 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsbellvar.h,v 1.1 2017/06/11 03:55:56 nat Exp $ */
+/* $NetBSD: wsbellvar.h,v 1.2 2017/06/13 00:49:05 nat Exp $ */
 /*-
  * Copyright (c) 2017 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
  * All rights reserved.
@@ -35,7 +35,6 @@
        u_int pitch;
        u_int period;
        u_int volume;
-       bool dying;
 };
 
 struct wsbell_softc {