Gigacommit to improve device-driver source compatibility between

branches:

Initialize struct cdevsw using C99 sparse initializtion and remove
all initializations to default values.

This patch is automatically generated and has been tested by compiling
LINT with all the fields in struct cdevsw in reverse order on alpha,
sparc64 and i386.

Approved by:    re(scottl)

4 files changed, 26 insertions, 52 deletions

diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index be2f7f8..8c59946 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -70,19 +70,13 @@ static d_ioctl_t agp_ioctl;
 static d_mmap_t agp_mmap;
 
 static struct cdevsw agp_cdevsw = {
-	/* open */	agp_open,
-	/* close */	agp_close,
-	/* read */	noread,
-	/* write */	nowrite,
-	/* ioctl */	agp_ioctl,
-	/* poll */	nopoll,
-	/* mmap */	agp_mmap,
-	/* strategy */	nostrategy,
-	/* name */	"agp",
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	D_TTY,
+	.d_open =	agp_open,
+	.d_close =	agp_close,
+	.d_ioctl =	agp_ioctl,
+	.d_mmap =	agp_mmap,
+	.d_name =	"agp",
+	.d_maj =	CDEV_MAJOR,
+	.d_flags =	D_TTY,
 };
 
 static devclass_t agp_devclass;
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index e0ac1d1..be81f61 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -192,19 +192,11 @@ static	d_close_t	ti_close;
 static	d_ioctl_t	ti_ioctl2;
 
 static struct cdevsw ti_cdevsw = {
-        /* open */      ti_open,
-        /* close */     ti_close,
-        /* read */      noread,
-        /* write */     nowrite,
-        /* ioctl */     ti_ioctl2,
-        /* poll */      seltrue,
-        /* mmap */      nommap,
-        /* strategy */  nostrategy,
-        /* name */      "ti",
-        /* maj */       TI_CDEV_MAJOR,
-        /* dump */      nodump,
-        /* psize */     nopsize,
-        /* flags */     0,
+	.d_open =	ti_open,
+	.d_close =	ti_close,
+	.d_ioctl =	ti_ioctl2,
+	.d_name =	"ti",
+	.d_maj =	TI_CDEV_MAJOR,
 };
 
 static int ti_probe		(device_t);
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 09bfbae..96bc7d5 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -228,19 +228,14 @@ static	d_mmap_t	meteor_mmap;
 
 #define CDEV_MAJOR 67
 static struct cdevsw meteor_cdevsw = {
-	/* open */	meteor_open,
-	/* close */	meteor_close,
-	/* read */	meteor_read,
-	/* write */	meteor_write,
-	/* ioctl */	meteor_ioctl,
-	/* poll */	nopoll,
-	/* mmap */	meteor_mmap,
-	/* strategy */	nostrategy,
-	/* name */	"meteor",
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	0,
+	.d_open =	meteor_open,
+	.d_close =	meteor_close,
+	.d_read =	meteor_read,
+	.d_write =	meteor_write,
+	.d_ioctl =	meteor_ioctl,
+	.d_mmap =	meteor_mmap,
+	.d_name =	"meteor",
+	.d_maj =	CDEV_MAJOR,
 };
 #endif
 
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 379a749..0c269d4 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -44,19 +44,12 @@ static d_mmap_t xrpu_mmap;
 
 #define CDEV_MAJOR 100
 static struct cdevsw xrpu_cdevsw = {
-	/* open */	xrpu_open,
-	/* close */	xrpu_close,
-	/* read */	noread,
-	/* write */	nowrite,
-	/* ioctl */	xrpu_ioctl,
-	/* poll */	nopoll,
-	/* mmap */	xrpu_mmap,
-	/* strategy */	nostrategy,
-	/* name */	"xrpu",
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	0,
+	.d_open =	xrpu_open,
+	.d_close =	xrpu_close,
+	.d_ioctl =	xrpu_ioctl,
+	.d_mmap =	xrpu_mmap,
+	.d_name =	"xrpu",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static MALLOC_DEFINE(M_XRPU, "xrpu", "XRPU related");