2 files changed, 13 insertions, 27 deletions

diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 379a75322198..436dbc8d7fe6 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -53,19 +53,14 @@ static d_ioctl_t	ofw_dev_ioctl;
 #define	CDEV_MAJOR	97
 
 static struct cdevsw ofw_cdevsw = {
-	/* open */	ofw_dev_open,
-	/* close */	ofw_dev_close,
-	/* read */	ttyread,
-	/* write */	ttywrite,
-	/* ioctl */	ofw_dev_ioctl,
-	/* poll */	ttypoll,
-	/* mmap */	nommap,
-	/* strategy */	nostrategy,
-	/* name */	"ofw",
-	/* major */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	0,
+	.d_open =	ofw_dev_open,
+	.d_close =	ofw_dev_close,
+	.d_read =	ttyread,
+	.d_write =	ttywrite,
+	.d_ioctl =	ofw_dev_ioctl,
+	.d_poll =	ttypoll,
+	.d_name =	"ofw",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static struct tty		*ofw_tp = NULL;
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index 6f4061961818..c197eb82c801 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -66,20 +66,11 @@ static d_ioctl_t openfirm_ioctl;
 #define	OPENFIRM_MINOR	0
 
 static struct cdevsw openfirm_cdevsw = {
-	/* open */	nullopen,
-	/* close */	nullclose,
-	/* read */	noread,
-	/* write */	nowrite,
-	/* ioctl */	openfirm_ioctl,
-	/* poll */	nopoll,
-	/* mmap */	nommap,
-	/* strategy */	nostrategy,
-	/* name */	"openfirm",
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	0,
-	/* kqfilter */	nokqfilter
+	.d_open =	nullopen,
+	.d_close =	nullclose,
+	.d_ioctl =	openfirm_ioctl,
+	.d_name =	"openfirm",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static phandle_t lastnode;	/* speed hack */