From 0ae911eb0e57eebb61c50c02ddf69aa67ed19599 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Mon, 3 Mar 2003 12:15:54 +0000
Subject: 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)
---
 sys/i4b/driver/i4b_ctl.c    | 19 ++++++-------------
 sys/i4b/driver/i4b_rbch.c   | 21 ++++++++-------------
 sys/i4b/driver/i4b_tel.c    | 21 ++++++++-------------
 sys/i4b/driver/i4b_trace.c  | 20 +++++++-------------
 sys/i4b/layer4/i4b_i4bdrv.c | 20 +++++++-------------
 5 files changed, 36 insertions(+), 65 deletions(-)

(limited to 'sys/i4b')

diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index 9a2b789..4eb03c3 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -59,19 +59,12 @@ static	d_poll_t	i4bctlpoll;
 #define CDEV_MAJOR 55
 
 static struct cdevsw i4bctl_cdevsw = {
-	/* open */      i4bctlopen,
-	/* close */     i4bctlclose,
-	/* read */      noread,
-	/* write */     nowrite,
-	/* ioctl */     i4bctlioctl,
-	/* poll */      i4bctlpoll,
-	/* mmap */      nommap,
-	/* strategy */  nostrategy,
-	/* name */      "i4bctl",
-	/* maj */       CDEV_MAJOR,
-	/* dump */      nodump,
-	/* psize */     nopsize,
-	/* flags */     0,
+	.d_open =	i4bctlopen,
+	.d_close =	i4bctlclose,
+	.d_ioctl =	i4bctlioctl,
+	.d_poll =	i4bctlpoll,
+	.d_name =	"i4bctl",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4bctlattach(void *);
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 63b941d..ebd4866 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -113,19 +113,14 @@ static 	d_poll_t	i4brbchpoll;
 #define CDEV_MAJOR 57
 
 static struct cdevsw i4brbch_cdevsw = {
-	/* open */      i4brbchopen,
-	/* close */     i4brbchclose,
-	/* read */      i4brbchread,
-	/* write */     i4brbchwrite,
-	/* ioctl */     i4brbchioctl,
-	/* poll */      i4brbchpoll,
-	/* mmap */      nommap,
-	/* strategy */  nostrategy,
-	/* name */      "i4brbch",
-	/* maj */       CDEV_MAJOR,
-	/* dump */      nodump,
-	/* psize */     nopsize,
-	/* flags */     0,
+	.d_open =	i4brbchopen,
+	.d_close =	i4brbchclose,
+	.d_read =	i4brbchread,
+	.d_write =	i4brbchwrite,
+	.d_ioctl =	i4brbchioctl,
+	.d_poll =	i4brbchpoll,
+	.d_name =	"i4brbch",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4brbchattach(void *);
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 3792e86..231886d 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -136,19 +136,14 @@ static d_poll_t i4btelpoll;
 #define CDEV_MAJOR 56
 
 static struct cdevsw i4btel_cdevsw = {
-	/* open */      i4btelopen,
-	/* close */     i4btelclose,
-	/* read */      i4btelread,
-	/* write */     i4btelwrite,
-	/* ioctl */     i4btelioctl,
-	/* poll */      i4btelpoll,
-	/* mmap */      nommap,
-	/* strategy */  nostrategy,
-	/* name */      "i4btel",
-	/* maj */       CDEV_MAJOR,
-	/* dump */      nodump,
-	/* psize */     nopsize,
-	/* flags */     0,
+	.d_open =	i4btelopen,
+	.d_close =	i4btelclose,
+	.d_read =	i4btelread,
+	.d_write =	i4btelwrite,
+	.d_ioctl =	i4btelioctl,
+	.d_poll =	i4btelpoll,
+	.d_name =	"i4btel",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4btelattach(void *);
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index a8201a4..d7c89e0 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -76,19 +76,13 @@ static d_poll_t i4btrcpoll;
 #define CDEV_MAJOR 59
 
 static struct cdevsw i4btrc_cdevsw = {
-	/* open */      i4btrcopen,
-        /* close */     i4btrcclose,
-        /* read */      i4btrcread,
-        /* write */     nowrite,
-        /* ioctl */     i4btrcioctl,
-        /* poll */      i4btrcpoll,
-        /* mmap */      nommap,
-        /* strategy */  nostrategy,
-        /* name */      "i4btrc",
-        /* maj */       CDEV_MAJOR,
-        /* dump */      nodump,
-        /* psize */     nopsize,
-        /* flags */     0,
+	.d_open =	i4btrcopen,
+	.d_close =	i4btrcclose,
+	.d_read =	i4btrcread,
+	.d_ioctl =	i4btrcioctl,
+	.d_poll =	i4btrcpoll,
+	.d_name =	"i4btrc",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4btrcattach(void *);
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 6d4a107..24d896a 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -79,19 +79,13 @@ static	d_poll_t	i4bpoll;
 #define CDEV_MAJOR 60
 
 static struct cdevsw i4b_cdevsw = {
-	/* open */      i4bopen,
-	/* close */     i4bclose,
-	/* read */      i4bread,
-	/* write */     nowrite,
-	/* ioctl */     i4bioctl,
-	/* poll */      i4bpoll,
-	/* mmap */      nommap,
-	/* strategy */  nostrategy,
-	/* name */      "i4b",
-	/* maj */       CDEV_MAJOR,
-	/* dump */      nodump,
-	/* psize */     nopsize,
-	/* flags */     0,
+	.d_open =	i4bopen,
+	.d_close =	i4bclose,
+	.d_read =	i4bread,
+	.d_ioctl =	i4bioctl,
+	.d_poll =	i4bpoll,
+	.d_name =	"i4b",
+	.d_maj =	CDEV_MAJOR,
 };
 
 static void i4battach(void *);
-- 
cgit v1.1