Mon Jan 4 15:29:34 2021 UTC ()

Use sel{record,remove}_knote().


(thorpej)

diff -r1.62 -r1.63 src/sys/arch/sparc/dev/tctrl.c

--- src/sys/arch/sparc/dev/tctrl.c 2020/06/13 05:31:28	1.62
+++ src/sys/arch/sparc/dev/tctrl.c 2021/01/04 15:29:34	1.63

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tctrl.c,v 1.62 2020/06/13 05:31:28 jdc Exp $	*/
+/*	$NetBSD: tctrl.c,v 1.63 2021/01/04 15:29:34 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.62 2020/06/13 05:31:28 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.63 2021/01/04 15:29:34 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/syslog.h>
 @@ -1208,68 +1208,66 @@ tctrlpoll(dev_t dev, int events, struct
 			selrecord(l, &sc->sc_rsel);
+	}
 	return (revents);
+}
 static void
 filt_tctrlrdetach(struct knote *kn)
+{
 	struct tctrl_softc *sc = kn->kn_hook;
 	int s;
 	s = splts102();
-	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
+	selremove_knote(&sc->sc_rsel, kn);
 	splx(s);
+}
 static int
 filt_tctrlread(struct knote *kn, long hint)
+{
 	struct tctrl_softc *sc = kn->kn_hook;
 	kn->kn_data = sc->sc_event_count;
 	return (kn->kn_data > 0);
+}
 static const struct filterops tctrlread_filtops = {
 	.f_isfd = 1,
 	.f_attach = NULL,
 	.f_detach = filt_tctrlrdetach,
 	.f_event = filt_tctrlread,
 };
 int
 tctrlkqfilter(dev_t dev, struct knote *kn)
+{
 	struct tctrl_softc *sc = device_lookup_private(&tctrl_cd,
 						       TCTRL_STD_DEV);
 	struct klist *klist;
 	int s;
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &tctrlread_filtops;
 		break;
 	default:
 		return (1);
+	}
 	kn->kn_hook = sc;
 	s = splts102();
-	SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+	selrecord_knote(&sc->sc_rsel, kn);
 	splx(s);
 	return (0);
+}
 static void
 tctrl_sensor_setup(struct tctrl_softc *sc)
+{
 	int i, error;
 	sc->sc_sme = sysmon_envsys_create();
 	/* case temperature */