CVS commit: src/sys/arch/macppc/dev

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Sat Dec 19 21:54:42 UTC 2020

Modified Files:
        src/sys/arch/macppc/dev: aed.c apm.c

Log Message:
Use sel{record,remove}_knote().


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/macppc/dev/aed.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/macppc/dev/apm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/macppc/dev/aed.c
diff -u src/sys/arch/macppc/dev/aed.c:1.30 src/sys/arch/macppc/dev/aed.c:1.31
--- src/sys/arch/macppc/dev/aed.c:1.30	Wed Oct 25 08:12:37 2017
+++ src/sys/arch/macppc/dev/aed.c	Sat Dec 19 21:54:42 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: aed.c,v 1.30 2017/10/25 08:12:37 maya Exp $	*/
+/*	$NetBSD: aed.c,v 1.31 2020/12/19 21:54:42 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1994	Bradley A. Grantham
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.30 2017/10/25 08:12:37 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.31 2020/12/19 21:54:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -590,7 +590,7 @@ filt_aedrdetach(struct knote *kn)
 	int s;
 
 	s = spladb();
-	SLIST_REMOVE(&aed_sc->sc_selinfo.sel_klist, kn, knote, kn_selnext);
+	selremove_knote(&aed_sc->sc_selinfo, kn);
 	splx(s);
 }
 
@@ -619,17 +619,14 @@ static const struct filterops aed_seltru
 int
 aedkqfilter(dev_t dev, struct knote *kn)
 {
-	struct klist *klist;
 	int s;
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &aed_sc->sc_selinfo.sel_klist;
 		kn->kn_fop = &aedread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &aed_sc->sc_selinfo.sel_klist;
 		kn->kn_fop = &aed_seltrue_filtops;
 		break;
 
@@ -640,7 +637,7 @@ aedkqfilter(dev_t dev, struct knote *kn)
 	kn->kn_hook = NULL;
 
 	s = spladb();
-	SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+	selrecord_knote(&aed_sc->sc_selinfo, kn);
 	splx(s);
 
 	return (0);

Index: src/sys/arch/macppc/dev/apm.c
diff -u src/sys/arch/macppc/dev/apm.c:1.28 src/sys/arch/macppc/dev/apm.c:1.29
--- src/sys/arch/macppc/dev/apm.c:1.28	Fri Oct 30 22:20:38 2020
+++ src/sys/arch/macppc/dev/apm.c	Sat Dec 19 21:54:42 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: apm.c,v 1.28 2020/10/30 22:20:38 christos Exp $	*/
+/*	$NetBSD: apm.c,v 1.29 2020/12/19 21:54:42 thorpej Exp $	*/
 /*	$OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $	*/
 
 /*-
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.28 2020/10/30 22:20:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.29 2020/12/19 21:54:42 thorpej Exp $");
 
 #include "apm.h"
 
@@ -418,7 +418,7 @@ filt_apmrdetach(struct knote *kn)
 	struct apm_softc *sc = (struct apm_softc *)kn->kn_hook;
 
 	APM_LOCK(sc);
-	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
+	selremove_knote(&sc->sc_rsel, kn);
 	APM_UNLOCK(sc);
 }
 
@@ -442,11 +442,9 @@ int
 apmkqfilter(dev_t dev, struct knote *kn)
 {
 	struct apm_softc *sc = device_lookup_private(&apm_cd,APMUNIT(dev));
-	struct klist *klist;
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &apmread_filtops;
 		break;
 	default:
@@ -456,7 +454,7 @@ apmkqfilter(dev_t dev, struct knote *kn)
 	kn->kn_hook = sc;
 
 	APM_LOCK(sc);
-	SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+	selrecord_knote(&sc->sc_rsel, kn);
 	APM_UNLOCK(sc);
 
 	return (0);