From 2ad042616d6efe261753b6bd245f5cdb67c1cf0f Mon Sep 17 00:00:00 2001 From: visa Date: Tue, 28 Jun 2022 14:43:50 +0000 Subject: [PATCH] Remove unused field d_poll from struct cdevsw. OK miod@ mpi@ --- sys/arch/amd64/amd64/conf.c | 8 +- sys/arch/amd64/include/conf.h | 4 +- sys/arch/arm/include/conf.h | 6 +- sys/arch/arm64/include/conf.h | 6 +- sys/arch/i386/i386/conf.c | 8 +- sys/arch/i386/include/conf.h | 4 +- sys/arch/landisk/include/conf.h | 4 +- sys/arch/loongson/include/conf.h | 4 +- sys/arch/luna88k/include/conf.h | 8 +- sys/arch/macppc/include/conf.h | 6 +- sys/arch/octeon/include/conf.h | 6 +- sys/arch/powerpc64/include/conf.h | 4 +- sys/arch/riscv64/include/conf.h | 4 +- sys/arch/sparc64/include/conf.h | 12 +-- sys/sys/conf.h | 142 +++++++++++++++--------------- 15 files changed, 112 insertions(+), 114 deletions(-) diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index d4d95ae5caa..e0a772ebd33 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.74 2021/11/11 10:03:08 claudio Exp $ */ +/* $OpenBSD: conf.c,v 1.75 2022/06/28 14:43:50 visa Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -79,14 +79,14 @@ int nblkdev = nitems(bdevsw); #define cdev_ocis_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } /* open, close, read */ #define cdev_nvram_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, (dev_type_ioctl((*))) enodev, \ - (dev_type_stop((*))) enodev, 0, seltrue, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } /* open, close, ioctl */ @@ -95,7 +95,7 @@ int nblkdev = nitems(bdevsw); (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, \ dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } #define mmread mmrw diff --git a/sys/arch/amd64/include/conf.h b/sys/arch/amd64/include/conf.h index a3c1fd7848f..5a2b10fe45b 100644 --- a/sys/arch/amd64/include/conf.h +++ b/sys/arch/amd64/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.8 2020/05/13 08:32:43 mpi Exp $ */ +/* $OpenBSD: conf.h,v 1.9 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -46,7 +46,7 @@ cdev_decl(bios); #define cdev_acpi_init(c,n) {\ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } cdev_decl(acpi); diff --git a/sys/arch/arm/include/conf.h b/sys/arch/arm/include/conf.h index 8b12391c7ab..d813f12ddab 100644 --- a/sys/arch/arm/include/conf.h +++ b/sys/arch/arm/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.11 2016/05/21 21:24:36 kettenis Exp $ */ +/* $OpenBSD: conf.h,v 1.12 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.7 2002/04/19 01:04:39 wiz Exp $ */ /* @@ -61,7 +61,7 @@ cdev_decl(fd); #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } cdev_decl(com); @@ -74,7 +74,7 @@ cdev_decl(spkr); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(openprom); diff --git a/sys/arch/arm64/include/conf.h b/sys/arch/arm64/include/conf.h index 8fc109a63c1..1eefde6be5c 100644 --- a/sys/arch/arm64/include/conf.h +++ b/sys/arch/arm64/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.3 2019/01/23 09:57:36 phessler Exp $ */ +/* $OpenBSD: conf.h,v 1.4 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -43,7 +43,7 @@ cdev_decl(mm); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(openprom); @@ -52,7 +52,7 @@ cdev_decl(openprom); #define cdev_acpiapm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } cdev_decl(apm); diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index f99fef71cf1..5fdc39bce3e 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.172 2021/11/11 10:03:09 claudio Exp $ */ +/* $OpenBSD: conf.c,v 1.173 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -81,21 +81,21 @@ int nblkdev = nitems(bdevsw); #define cdev_joy_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } /* open, close, ioctl */ #define cdev_ocis_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } /* open, close, read */ #define cdev_nvram_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, (dev_type_ioctl((*))) enodev, \ - (dev_type_stop((*))) enodev, 0, seltrue, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } #define mmread mmrw diff --git a/sys/arch/i386/include/conf.h b/sys/arch/i386/include/conf.h index 54dd869f608..ecebaeed6fe 100644 --- a/sys/arch/i386/include/conf.h +++ b/sys/arch/i386/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.19 2020/05/25 06:37:53 mpi Exp $ */ +/* $OpenBSD: conf.h,v 1.20 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -43,7 +43,7 @@ cdev_decl(fd); #define cdev_acpiapm_init(c,n) {\ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } cdev_decl(spkr); diff --git a/sys/arch/landisk/include/conf.h b/sys/arch/landisk/include/conf.h index 6771f00695a..166e468ec8a 100644 --- a/sys/arch/landisk/include/conf.h +++ b/sys/arch/landisk/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.6 2011/07/04 16:52:41 nicm Exp $ */ +/* $OpenBSD: conf.h,v 1.7 2022/06/28 14:43:50 visa Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -63,7 +63,7 @@ cdev_decl(fd); #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } cdev_decl(com); diff --git a/sys/arch/loongson/include/conf.h b/sys/arch/loongson/include/conf.h index d61820fdedd..20ed82dcb64 100644 --- a/sys/arch/loongson/include/conf.h +++ b/sys/arch/loongson/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.3 2011/07/04 16:52:41 nicm Exp $ */ +/* $OpenBSD: conf.h,v 1.4 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -36,7 +36,7 @@ #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } cdev_decl(apm); diff --git a/sys/arch/luna88k/include/conf.h b/sys/arch/luna88k/include/conf.h index 0b79af80e1d..1e2e94f5cfd 100644 --- a/sys/arch/luna88k/include/conf.h +++ b/sys/arch/luna88k/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.6 2020/05/13 08:10:03 mpi Exp $ */ +/* $OpenBSD: conf.h,v 1.7 2022/06/28 14:43:50 visa Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. * All rights reserved. @@ -53,18 +53,18 @@ cdev_decl(wd); dev_init(c,n,open), dev_init(c,n,close), \ (dev_type_read((*))) enodev, dev_init(c,n,write), \ dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } + 0, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } /* open, close, ioctl, mmap */ #define cdev_pcex_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ dev_init(c,n,mmap) } /* open, close, ioctl, mmap */ #define cdev_xp_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ dev_init(c,n,mmap) } diff --git a/sys/arch/macppc/include/conf.h b/sys/arch/macppc/include/conf.h index 8f071cdd8fd..823d3feccca 100644 --- a/sys/arch/macppc/include/conf.h +++ b/sys/arch/macppc/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.14 2011/07/04 16:52:41 nicm Exp $ */ +/* $OpenBSD: conf.h,v 1.15 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -40,7 +40,7 @@ cdev_decl(mm); #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } cdev_decl(apm); @@ -50,7 +50,7 @@ cdev_decl(zs); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(openprom); diff --git a/sys/arch/octeon/include/conf.h b/sys/arch/octeon/include/conf.h index a954a3fa714..e49a3170684 100644 --- a/sys/arch/octeon/include/conf.h +++ b/sys/arch/octeon/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.3 2019/07/17 14:36:32 visa Exp $ */ +/* $OpenBSD: conf.h,v 1.4 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -39,14 +39,14 @@ #define cdev_octboot_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } /* open, close, ioctl */ #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(octboot); diff --git a/sys/arch/powerpc64/include/conf.h b/sys/arch/powerpc64/include/conf.h index 28f660fe733..7f818c14d61 100644 --- a/sys/arch/powerpc64/include/conf.h +++ b/sys/arch/powerpc64/include/conf.h @@ -10,14 +10,14 @@ cdev_decl(opalcons); #define cdev_kexec_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } /* open, close, ioctl */ #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(kexec); diff --git a/sys/arch/riscv64/include/conf.h b/sys/arch/riscv64/include/conf.h index 127b5ba3091..4e4cee002c2 100644 --- a/sys/arch/riscv64/include/conf.h +++ b/sys/arch/riscv64/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.3 2021/10/05 18:32:28 deraadt Exp $ */ +/* $OpenBSD: conf.h,v 1.4 2022/06/28 14:43:50 visa Exp $ */ /* * Copyright (c) 1996 Christos Zoulas. All rights reserved. @@ -42,7 +42,7 @@ cdev_decl(mm); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(openprom); diff --git a/sys/arch/sparc64/include/conf.h b/sys/arch/sparc64/include/conf.h index 1e10b53d048..cc9f8a06cea 100644 --- a/sys/arch/sparc64/include/conf.h +++ b/sys/arch/sparc64/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.26 2020/05/23 11:29:37 mpi Exp $ */ +/* $OpenBSD: conf.h,v 1.27 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.9 2001/03/26 12:33:26 lukem Exp $ */ /*- @@ -40,7 +40,7 @@ cdev_decl(openprom); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(uperf); @@ -49,7 +49,7 @@ cdev_decl(uperf); #define cdev_uperf_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } cdev_decl(vdsp); @@ -58,13 +58,13 @@ cdev_decl(vdsp); #define cdev_vdsp_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, selfalse, \ + (dev_type_stop((*))) nullop, 0, \ (dev_type_mmap((*))) enodev } #define cdev_gen_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, 0, dev_init(c,n,kqfilter) } cdev_decl(cn); @@ -125,6 +125,6 @@ cdev_decl(sbpp); #define cdev_bpp_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \ - 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } + 0, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } cdev_decl(bpp); diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 0a315bf5d9c..a37af252fb7 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.157 2022/06/27 14:11:44 visa Exp $ */ +/* $OpenBSD: conf.h,v 1.158 2022/06/28 14:43:50 visa Exp $ */ /* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */ /*- @@ -142,7 +142,6 @@ struct cdevsw { int (*d_stop)(struct tty *tp, int rw); struct tty * (*d_tty)(dev_t dev); - int (*d_poll)(dev_t dev, int events, struct proc *p); paddr_t (*d_mmap)(dev_t, off_t, int); u_int d_type; u_int d_flags; @@ -158,89 +157,88 @@ extern struct cdevsw cdevsw[]; #define dev_type_write(n) int n(dev_t, struct uio *, int) #define dev_type_stop(n) int n(struct tty *, int) #define dev_type_tty(n) struct tty *n(dev_t) -#define dev_type_poll(n) int n(dev_t, int, struct proc *) #define dev_type_mmap(n) paddr_t n(dev_t, off_t, int) #define dev_type_kqfilter(n) int n(dev_t, struct knote *) #define cdev_decl(n) \ dev_decl(n,open); dev_decl(n,close); dev_decl(n,read); \ dev_decl(n,write); dev_decl(n,ioctl); dev_decl(n,stop); \ - dev_decl(n,tty); dev_decl(n,poll); dev_decl(n,mmap); \ + dev_decl(n,tty); dev_decl(n,mmap); \ dev_decl(n,kqfilter) /* open, close, read, write, ioctl */ #define cdev_disk_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, seltrue, (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ D_DISK, 0, seltrue_kqfilter } /* open, close, read, write, ioctl */ #define cdev_tape_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, seltrue, (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, 0, seltrue_kqfilter } /* open, close, read, write, ioctl, stop, tty */ #define cdev_tty_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \ - dev_init(c,n,tty), ttpoll, (dev_type_mmap((*))) enodev, \ + dev_init(c,n,tty), (dev_type_mmap((*))) enodev, \ D_TTY, 0, ttkqfilter } -/* open, close, read, ioctl, poll, kqfilter */ +/* open, close, read, ioctl, kqfilter */ #define cdev_mouse_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev , 0, 0, dev_init(c,n,kqfilter) } #define cdev_notdef() { \ (dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \ (dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \ (dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \ - 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } + 0, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } -/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be a tty */ +/* open, close, read, write, ioctl, kqfilter -- XXX should be a tty */ #define cdev_cn_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ D_TTY, 0, dev_init(c,n,kqfilter) } -/* open, read, write, ioctl, poll, kqfilter -- XXX should be a tty */ +/* open, read, write, ioctl, kqfilter -- XXX should be a tty */ #define cdev_ctty_init(c,n) { \ dev_init(c,n,open), (dev_type_close((*))) nullop, dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ D_TTY, 0, dev_init(c,n,kqfilter) } /* open, close, read, write, ioctl, mmap */ #define cdev_mm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, dev_init(c,n,mmap), \ + (dev_type_stop((*))) enodev, 0, dev_init(c,n,mmap), \ 0, 0, seltrue_kqfilter } -/* open, close, read, write, ioctl, tty, poll, kqfilter */ +/* open, close, read, write, ioctl, tty, kqfilter */ #define cdev_ptc_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \ - dev_init(c,n,tty), dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + dev_init(c,n,tty), (dev_type_mmap((*))) enodev, \ D_TTY, 0, dev_init(c,n,kqfilter) } /* open, close, read, write, ioctl, mmap */ #define cdev_ptm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, (dev_type_mmap((*))) enodev } + (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev } -/* open, close, read, ioctl, poll, kqfilter XXX should be a generic device */ +/* open, close, read, ioctl, kqfilter XXX should be a generic device */ #define cdev_log_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } /* open */ @@ -248,223 +246,223 @@ extern struct cdevsw cdevsw[]; dev_init(c,n,open), (dev_type_close((*))) enodev, \ (dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \ (dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \ - 0, selfalse, (dev_type_mmap((*))) enodev } + 0, (dev_type_mmap((*))) enodev } -/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be generic device */ +/* open, close, read, write, ioctl, kqfilter -- XXX should be generic device */ #define cdev_tun_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, 0, dev_init(c,n,kqfilter) } -/* open, close, ioctl, poll, kqfilter -- XXX should be generic device */ +/* open, close, ioctl, kqfilter -- XXX should be generic device */ #define cdev_vscsi_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), \ (dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \ dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, 0, dev_init(c,n,kqfilter) } -/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be generic device */ +/* open, close, read, write, ioctl, kqfilter -- XXX should be generic device */ #define cdev_pppx_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, 0, dev_init(c,n,kqfilter) } -/* open, close, read, write, ioctl, poll, kqfilter, cloning -- XXX should be generic device */ +/* open, close, read, write, ioctl, kqfilter, cloning -- XXX should be generic device */ #define cdev_bpf_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, D_CLONE, dev_init(c,n,kqfilter) } /* open, close, ioctl */ #define cdev_ch_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } /* open, close, ioctl */ #define cdev_uk_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } /* open, close, ioctl, mmap */ #define cdev_fb_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ dev_init(c,n,mmap) } -/* open, close, read, write, ioctl, poll, kqfilter */ +/* open, close, read, write, ioctl, kqfilter */ #define cdev_audio_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } -/* open, close, read, write, ioctl, poll, kqfilter */ +/* open, close, read, write, ioctl, kqfilter */ #define cdev_midi_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } /* open, close, read */ #define cdev_ksyms_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, (dev_type_ioctl((*))) enodev, \ - (dev_type_stop((*))) enodev, 0, seltrue, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter } /* open, close, ioctl */ #define cdev_kstat_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } -/* open, close, read, write, ioctl, stop, tty, poll, mmap, kqfilter */ +/* open, close, read, write, ioctl, stop, tty, mmap, kqfilter */ #define cdev_wsdisplay_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \ - dev_init(c,n,tty), dev_init(c,n,poll), dev_init(c,n,mmap), \ + dev_init(c,n,tty), dev_init(c,n,mmap), \ D_TTY, 0, dev_init(c,n,kqfilter) } -/* open, close, read, write, ioctl, poll, kqfilter */ +/* open, close, read, write, ioctl, kqfilter */ #define cdev_random_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, seltrue, (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, 0, dev_init(c,n,kqfilter) } -/* open, close, ioctl, poll, nokqfilter */ +/* open, close, ioctl, nokqfilter */ #define cdev_usb_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } /* open, close, write */ #define cdev_ulpt_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \ - (dev_type_stop((*))) enodev, 0, selfalse, (dev_type_mmap((*))) enodev } + (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev } /* open, close, ioctl */ #define cdev_pf_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } -/* open, close, read, write, ioctl, poll, kqfilter */ +/* open, close, read, write, ioctl, kqfilter */ #define cdev_usbdev_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, 0, 0, \ + 0, (dev_type_mmap((*))) enodev, 0, 0, \ dev_init(c,n,kqfilter) } -/* open, close, read, write, ioctl, poll, kqfilter */ +/* open, close, read, write, ioctl, kqfilter */ #define cdev_fido_init(c,n) { \ dev_init(c,n,open), dev_init(c,uhid,close), dev_init(c,uhid,read), \ dev_init(c,uhid,write), dev_init(c,fido,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,uhid,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,uhid,kqfilter) } -/* open, close, read, write, ioctl, poll, kqfilter */ +/* open, close, read, write, ioctl, kqfilter */ #define cdev_ujoy_init(c,n) { \ dev_init(c,n,open), dev_init(c,uhid,close), dev_init(c,uhid,read), \ dev_init(c,uhid,write), dev_init(c,ujoy,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,uhid,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,uhid,kqfilter) } /* open, close, init */ #define cdev_pci_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } /* open, close, ioctl */ #define cdev_radio_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } -/* open, close, ioctl, read, mmap, poll, kqfilter */ +/* open, close, ioctl, read, mmap, kqfilter */ #define cdev_video_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ dev_init(c,n,mmap), 0, 0, dev_init(c,n,kqfilter) } /* open, close, write, ioctl */ #define cdev_spkr_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ - 0, seltrue, (dev_type_mmap((*))) enodev, \ + 0, (dev_type_mmap((*))) enodev, \ 0, 0, seltrue_kqfilter } /* open, close, write */ #define cdev_lpt_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \ - (dev_type_stop((*))) enodev, 0, seltrue, (dev_type_mmap((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev, \ 0, 0, seltrue_kqfilter } /* open, close, read, ioctl, mmap */ #define cdev_bktr_init(c, n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, dev_init(c,n,mmap), \ + (dev_type_stop((*))) enodev, 0, dev_init(c,n,mmap), \ 0, 0, seltrue_kqfilter } -/* open, close, read, ioctl, poll, kqfilter */ +/* open, close, read, ioctl, kqfilter */ #define cdev_hotplug_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) } /* open, close, ioctl */ #define cdev_gpio_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } /* open, close, ioctl */ #define cdev_bio_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } -/* open, close, read, ioctl, poll, mmap, nokqfilter */ +/* open, close, read, ioctl, mmap, nokqfilter */ #define cdev_drm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c, n, read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ dev_init(c,n,mmap), 0, D_CLONE, dev_init(c,n,kqfilter) } /* open, close, ioctl */ #define cdev_amdmsr_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } -/* open, close, read, write, poll, ioctl */ +/* open, close, read, write, ioctl */ #define cdev_fuse_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ dev_init(c,n,write), dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, D_CLONE, dev_init(c,n,kqfilter) } /* open, close, ioctl */ @@ -473,28 +471,28 @@ extern struct cdevsw cdevsw[]; (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, \ dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev } /* open, close, ioctl */ #define cdev_ipmi_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, seltrue, (dev_type_mmap((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev, \ 0, 0, seltrue_kqfilter } /* open, close, ioctl, mmap */ #define cdev_kcov_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_init(c,n,mmap)), 0, D_CLONE } /* open, close, read, ioctl */ #define cdev_dt_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, selfalse, \ + (dev_type_stop((*))) enodev, 0, \ (dev_type_mmap((*))) enodev, 0, D_CLONE } #endif -- 2.20.1