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/isa/fd.c      | 22 +++++++++-------------
 sys/isa/psm.c     | 20 +++++++-------------
 sys/isa/vga_isa.c | 21 ++++++++-------------
 3 files changed, 24 insertions(+), 39 deletions(-)

(limited to 'sys/isa')

diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 9173564..bb2cc86 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -477,19 +477,15 @@ fdin_rd(fdc_p fdc)
 
 #define CDEV_MAJOR 9
 static struct cdevsw fd_cdevsw = {
-	/* open */	Fdopen,
-	/* close */	fdclose,
-	/* read */	physread,
-	/* write */	physwrite,
-	/* ioctl */	fdioctl,
-	/* poll */	nopoll,
-	/* mmap */	nommap,
-	/* strategy */	fdstrategy,
-	/* name */	"fd",
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	D_DISK,
+	.d_open =	Fdopen,
+	.d_close =	fdclose,
+	.d_read =	physread,
+	.d_write =	physwrite,
+	.d_ioctl =	fdioctl,
+	.d_strategy =	fdstrategy,
+	.d_name =	"fd",
+	.d_maj =	CDEV_MAJOR,
+	.d_flags =	D_DISK,
 };
 
 /*
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index 5b4cc20..968491d 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -326,19 +326,13 @@ static driver_t psm_driver = {
 #define CDEV_MAJOR        21
 
 static struct cdevsw psm_cdevsw = {
-	/* open */	psmopen,
-	/* close */	psmclose,
-	/* read */	psmread,
-	/* write */	nowrite,
-	/* ioctl */	psmioctl,
-	/* poll */	psmpoll,
-	/* mmap */	nommap,
-	/* strategy */	nostrategy,
-	/* name */	PSM_DRIVER_NAME,
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	0,
+	.d_open =	psmopen,
+	.d_close =	psmclose,
+	.d_read =	psmread,
+	.d_ioctl =	psmioctl,
+	.d_poll =	psmpoll,
+	.d_name =	PSM_DRIVER_NAME,
+	.d_maj =	CDEV_MAJOR,
 };
 
 /* debug message level */
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 9e7e61b..52844f3 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -69,19 +69,14 @@ static d_ioctl_t	isavga_ioctl;
 static d_mmap_t		isavga_mmap;
 
 static struct cdevsw isavga_cdevsw = {
-	/* open */	isavga_open,
-	/* close */	isavga_close,
-	/* read */	isavga_read,
-	/* write */	isavga_write,
-	/* ioctl */	isavga_ioctl,
-	/* poll */	nopoll,
-	/* mmap */	isavga_mmap,
-	/* strategy */	nostrategy,
-	/* name */	VGA_DRIVER_NAME,
-	/* maj */	-1,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	0,
+	.d_open =	isavga_open,
+	.d_close =	isavga_close,
+	.d_read =	isavga_read,
+	.d_write =	isavga_write,
+	.d_ioctl =	isavga_ioctl,
+	.d_mmap =	isavga_mmap,
+	.d_name =	VGA_DRIVER_NAME,
+	.d_maj =	-1,
 };
 
 #endif /* FB_INSTALL_CDEV */
-- 
cgit v1.1