Device megapatch 3/6:

Add missing D_TTY flags to various drivers.

Complete asserts that dev_t's passed to ttyread(), ttywrite(),
ttypoll() and ttykqwrite() have (d_flags & D_TTY) and a struct tty
pointer.

Make ttyread(), ttywrite(), ttypoll() and ttykqwrite() the default
cdevsw methods for D_TTY drivers and remove the explicit initializations
in various drivers cdevsw structures.

4 files changed, 0 insertions, 13 deletions

diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 4351a3051de8..2a715c03046b 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -388,13 +388,10 @@ static	d_ioctl_t	sioioctl;
 static struct cdevsw sio_cdevsw = {
 	.d_open =	sioopen,
 	.d_close =	sioclose,
-	.d_read =	ttyread,
 	.d_write =	siowrite,
 	.d_ioctl =	sioioctl,
-	.d_poll =	ttypoll,
 	.d_name =	driver_name,
 	.d_flags =	D_TTY,
-	.d_kqfilter =	ttykqfilter,
 };
 
 static	int	comconsole = -1;
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index e44400dc48a9..ee82892b6f14 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -648,10 +648,8 @@ static struct cdevsw stli_cdevsw = {
 	.d_read =	stliread,
 	.d_write =	stliwrite,
 	.d_ioctl =	stliioctl,
-	.d_poll =	ttypoll,
 	.d_name =	stli_drvname,
 	.d_flags =	D_TTY,
-	.d_kqfilter =	ttykqfilter,
 };
 
 #endif
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 351048020351..af16af93b75c 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -97,14 +97,10 @@ static	d_mmap_t	pcvt_mmap;
 static struct cdevsw vt_cdevsw = {
 	.d_open =	pcvt_open,
 	.d_close =	pcvt_close,
-	.d_read =	ttyread,
-	.d_write =	ttywrite,
 	.d_ioctl =	pcvt_ioctl,
-	.d_poll =	ttypoll,
 	.d_mmap =	pcvt_mmap,
 	.d_name =	"vt",
 	.d_flags =	D_TTY,
-	.d_kqfilter =	ttykqfilter,
 };
 
 static int pcvt_probe(device_t dev);
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 4665491dd57d..de0b2ccc9301 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -539,13 +539,9 @@ COMPAT_PCI_DRIVER (stlpci, stlpcidriver);
 static struct cdevsw stl_cdevsw = {
 	.d_open =	stlopen,
 	.d_close =	stlclose,
-	.d_read =	ttyread,
-	.d_write =	ttywrite,
 	.d_ioctl =	stlioctl,
-	.d_poll =	ttypoll,
 	.d_name =	"stl",
 	.d_flags =	D_TTY,
-	.d_kqfilter =	ttykqfilter,
 };
 
 #endif