Module Name: src
Committed By: thorpej
Date: Sun Sep 26 14:32:02 UTC 2021
Modified Files:
src/sys/arch/landisk/dev: button.c
Log Message:
Use seltrue_filtops rather than rolling our own with filt_seltrue.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/landisk/dev/button.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/landisk/dev/button.c
diff -u src/sys/arch/landisk/dev/button.c:1.12 src/sys/arch/landisk/dev/button.c:1.13
--- src/sys/arch/landisk/dev/button.c:1.12 Sun Sep 26 01:16:07 2021
+++ src/sys/arch/landisk/dev/button.c Sun Sep 26 14:32:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: button.c,v 1.12 2021/09/26 01:16:07 thorpej Exp $ */
+/* $NetBSD: button.c,v 1.13 2021/09/26 14:32:02 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.12 2021/09/26 01:16:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.13 2021/09/26 14:32:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -312,13 +312,6 @@ static const struct filterops btn_read_f
.f_event = filt_btn_read,
};
-static const struct filterops btn_write_filtops = {
- .f_flags = FILTEROP_ISFD,
- .f_attach = NULL,
- .f_detach = filt_btn_rdetach,
- .f_event = filt_seltrue,
-};
-
int
btnkqfilter(dev_t dev, struct knote *kn)
{
@@ -330,20 +323,19 @@ btnkqfilter(dev_t dev, struct knote *kn)
switch (kn->kn_filter) {
case EVFILT_READ:
kn->kn_fop = &btn_read_filtops;
+ mutex_enter(&btn_event_queue_lock);
+ selrecord_knote(&btn_event_queue_selinfo, kn);
+ mutex_exit(&btn_event_queue_lock);
break;
case EVFILT_WRITE:
- kn->kn_fop = &btn_write_filtops;
+ kn->kn_fop = &seltrue_filtops;
break;
default:
return (1);
}
- mutex_enter(&btn_event_queue_lock);
- selrecord_knote(&btn_event_queue_selinfo, kn);
- mutex_exit(&btn_event_queue_lock);
-
return (0);
}
