From 47959c89b98240561f063d16c70e7f7e7094e085 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Fri, 27 Feb 1998 06:39:32 +0000
Subject: [PATCH] PCCARD-code related style nits, as requested. Submitted by:
 bde

---
 sys/dev/ed/if_ed.c   | 28 ++++++++++++++--------------
 sys/dev/fe/if_fe.c   |  8 ++++----
 sys/dev/sio/sio.c    |  8 ++++----
 sys/i386/isa/if_ed.c | 28 ++++++++++++++--------------
 sys/i386/isa/if_fe.c |  8 ++++----
 sys/i386/isa/sio.c   |  8 ++++----
 sys/isa/sio.c        |  8 ++++----
 7 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 17e4bc78c35d..b46ccd557e4e 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.133 1998/02/06 12:13:15 eivind Exp $
+ *	$Id: if_ed.c,v 1.134 1998/02/27 05:38:28 msmith Exp $
  */
 
 /*
@@ -173,31 +173,31 @@ void *ed_attach_NE2000_pci	__P((int, int));
 static int ed_probe_pccard	__P((struct isa_device *, u_char *));
 #endif
 
-static void    ds_getmcaf __P((struct ed_softc *, u_long *));
+static void	ds_getmcaf	__P((struct ed_softc *, u_long *));
 
-static void ed_get_packet(struct ed_softc *, char *, /* u_short */ int, int);
+static void	ed_get_packet	__P((struct ed_softc *, char *, /* u_short */ int, int));
 
-static void	ed_rint __P((struct ed_softc *));
-static void	ed_xmit __P((struct ed_softc *));
-static char *	ed_ring_copy __P((struct ed_softc *, char *, char *,
+static void	ed_rint		__P((struct ed_softc *));
+static void	ed_xmit		__P((struct ed_softc *));
+static char *	ed_ring_copy	__P((struct ed_softc *, char *, char *,
 				  /* u_short */ int));
 static void	ed_hpp_set_physical_link __P((struct ed_softc *));
-static void	ed_hpp_readmem __P((struct ed_softc *, int, unsigned char *,
+static void	ed_hpp_readmem	__P((struct ed_softc *, int, unsigned char *,
 				    /* u_short */ int));
 static u_short	ed_hpp_write_mbufs __P((struct ed_softc *, struct mbuf *,
 					int));
 
-static void	ed_pio_readmem __P((struct ed_softc *, int, unsigned char *,
+static void	ed_pio_readmem	__P((struct ed_softc *, int, unsigned char *,
 				    /* u_short */ int));
-static void	ed_pio_writemem __P((struct ed_softc *, char *,
+static void	ed_pio_writemem	__P((struct ed_softc *, char *,
 				     /* u_short */ int, /* u_short */ int));
 static u_short	ed_pio_write_mbufs __P((struct ed_softc *, struct mbuf *,
 					int));
 void edintr_sc			__P((struct ed_softc *));
 
-static void    ed_setrcr(struct ed_softc *);
+static void	ed_setrcr	__P((struct ed_softc *));
 
-static u_long ds_crc(u_char *ep);
+static u_long	ds_crc		__P((u_char *ep));
 
 #if (NCARD > 0) || (NPNP > 0)
 #include <sys/kernel.h>
@@ -210,9 +210,9 @@ static u_long ds_crc(u_char *ep);
 /*
  *	PC-Card (PCMCIA) specific code.
  */
-static int edinit(struct pccard_devinfo *);		/* init device */
-static void edunload(struct pccard_devinfo *);		/* Disable driver */
-static int card_intr(struct pccard_devinfo *);		/* Interrupt handler */
+static int	edinit		__P((struct pccard_devinfo *));
+static void	edunload	__P((struct pccard_devinfo *));
+static int	card_intr	__P((struct pccard_devinfo *));
 
 static struct pccard_device ed_info = {
 	"ed",
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 0ce73b7b4dc7..462d1a5432a4 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.37 1998/01/08 23:40:53 eivind Exp $
+ * $Id: if_fe.c,v 1.38 1998/02/27 05:38:31 msmith Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -326,9 +326,9 @@ outblk ( struct fe_softc * sc, int offs, u_char const * mem, int len )
 /*
  *      PC-Card (PCMCIA) specific code.
  */
-static int feinit(struct pccard_devinfo *);		/* init device */
-static void feunload(struct pccard_devinfo *);		/* Disable driver */
-static int fe_card_intr(struct pccard_devinfo *);	/* Interrupt handler */
+static int feinit	(struct pccard_devinfo *);
+static void feunload	(struct pccard_devinfo *);
+static int fe_card_intr	(struct pccard_devinfo *);
 
 static struct pccard_device fe_info = {
 	"fe",
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index b5aad90eec23..9ac8889b9413 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.197 1998/02/14 16:17:17 nate Exp $
+ *	$Id: sio.c,v 1.198 1998/02/27 05:38:32 msmith Exp $
  */
 
 #include "opt_comconsole.h"
@@ -481,9 +481,9 @@ SYSCTL_PROC(_machdep, OID_AUTO, conspeed, CTLTYPE_INT | CTLFLAG_RW,
 /*
  *	PC-Card (PCMCIA) specific code.
  */
-static int sioinit(struct pccard_devinfo *);		/* init device */
-static void siounload(struct pccard_devinfo *);		/* Disable driver */
-static int card_intr(struct pccard_devinfo *);		/* Interrupt handler */
+static int	sioinit		__P((struct pccard_devinfo *));
+static void	siounload	__P((struct pccard_devinfo *));
+static int	card_intr	__P((struct pccard_devinfo *));
 
 static struct pccard_device sio_info = {
 	driver_name,
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 17e4bc78c35d..b46ccd557e4e 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.133 1998/02/06 12:13:15 eivind Exp $
+ *	$Id: if_ed.c,v 1.134 1998/02/27 05:38:28 msmith Exp $
  */
 
 /*
@@ -173,31 +173,31 @@ void *ed_attach_NE2000_pci	__P((int, int));
 static int ed_probe_pccard	__P((struct isa_device *, u_char *));
 #endif
 
-static void    ds_getmcaf __P((struct ed_softc *, u_long *));
+static void	ds_getmcaf	__P((struct ed_softc *, u_long *));
 
-static void ed_get_packet(struct ed_softc *, char *, /* u_short */ int, int);
+static void	ed_get_packet	__P((struct ed_softc *, char *, /* u_short */ int, int));
 
-static void	ed_rint __P((struct ed_softc *));
-static void	ed_xmit __P((struct ed_softc *));
-static char *	ed_ring_copy __P((struct ed_softc *, char *, char *,
+static void	ed_rint		__P((struct ed_softc *));
+static void	ed_xmit		__P((struct ed_softc *));
+static char *	ed_ring_copy	__P((struct ed_softc *, char *, char *,
 				  /* u_short */ int));
 static void	ed_hpp_set_physical_link __P((struct ed_softc *));
-static void	ed_hpp_readmem __P((struct ed_softc *, int, unsigned char *,
+static void	ed_hpp_readmem	__P((struct ed_softc *, int, unsigned char *,
 				    /* u_short */ int));
 static u_short	ed_hpp_write_mbufs __P((struct ed_softc *, struct mbuf *,
 					int));
 
-static void	ed_pio_readmem __P((struct ed_softc *, int, unsigned char *,
+static void	ed_pio_readmem	__P((struct ed_softc *, int, unsigned char *,
 				    /* u_short */ int));
-static void	ed_pio_writemem __P((struct ed_softc *, char *,
+static void	ed_pio_writemem	__P((struct ed_softc *, char *,
 				     /* u_short */ int, /* u_short */ int));
 static u_short	ed_pio_write_mbufs __P((struct ed_softc *, struct mbuf *,
 					int));
 void edintr_sc			__P((struct ed_softc *));
 
-static void    ed_setrcr(struct ed_softc *);
+static void	ed_setrcr	__P((struct ed_softc *));
 
-static u_long ds_crc(u_char *ep);
+static u_long	ds_crc		__P((u_char *ep));
 
 #if (NCARD > 0) || (NPNP > 0)
 #include <sys/kernel.h>
@@ -210,9 +210,9 @@ static u_long ds_crc(u_char *ep);
 /*
  *	PC-Card (PCMCIA) specific code.
  */
-static int edinit(struct pccard_devinfo *);		/* init device */
-static void edunload(struct pccard_devinfo *);		/* Disable driver */
-static int card_intr(struct pccard_devinfo *);		/* Interrupt handler */
+static int	edinit		__P((struct pccard_devinfo *));
+static void	edunload	__P((struct pccard_devinfo *));
+static int	card_intr	__P((struct pccard_devinfo *));
 
 static struct pccard_device ed_info = {
 	"ed",
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 0ce73b7b4dc7..462d1a5432a4 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.37 1998/01/08 23:40:53 eivind Exp $
+ * $Id: if_fe.c,v 1.38 1998/02/27 05:38:31 msmith Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -326,9 +326,9 @@ outblk ( struct fe_softc * sc, int offs, u_char const * mem, int len )
 /*
  *      PC-Card (PCMCIA) specific code.
  */
-static int feinit(struct pccard_devinfo *);		/* init device */
-static void feunload(struct pccard_devinfo *);		/* Disable driver */
-static int fe_card_intr(struct pccard_devinfo *);	/* Interrupt handler */
+static int feinit	(struct pccard_devinfo *);
+static void feunload	(struct pccard_devinfo *);
+static int fe_card_intr	(struct pccard_devinfo *);
 
 static struct pccard_device fe_info = {
 	"fe",
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index b5aad90eec23..9ac8889b9413 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.197 1998/02/14 16:17:17 nate Exp $
+ *	$Id: sio.c,v 1.198 1998/02/27 05:38:32 msmith Exp $
  */
 
 #include "opt_comconsole.h"
@@ -481,9 +481,9 @@ SYSCTL_PROC(_machdep, OID_AUTO, conspeed, CTLTYPE_INT | CTLFLAG_RW,
 /*
  *	PC-Card (PCMCIA) specific code.
  */
-static int sioinit(struct pccard_devinfo *);		/* init device */
-static void siounload(struct pccard_devinfo *);		/* Disable driver */
-static int card_intr(struct pccard_devinfo *);		/* Interrupt handler */
+static int	sioinit		__P((struct pccard_devinfo *));
+static void	siounload	__P((struct pccard_devinfo *));
+static int	card_intr	__P((struct pccard_devinfo *));
 
 static struct pccard_device sio_info = {
 	driver_name,
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index b5aad90eec23..9ac8889b9413 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.197 1998/02/14 16:17:17 nate Exp $
+ *	$Id: sio.c,v 1.198 1998/02/27 05:38:32 msmith Exp $
  */
 
 #include "opt_comconsole.h"
@@ -481,9 +481,9 @@ SYSCTL_PROC(_machdep, OID_AUTO, conspeed, CTLTYPE_INT | CTLFLAG_RW,
 /*
  *	PC-Card (PCMCIA) specific code.
  */
-static int sioinit(struct pccard_devinfo *);		/* init device */
-static void siounload(struct pccard_devinfo *);		/* Disable driver */
-static int card_intr(struct pccard_devinfo *);		/* Interrupt handler */
+static int	sioinit		__P((struct pccard_devinfo *));
+static void	siounload	__P((struct pccard_devinfo *));
+static int	card_intr	__P((struct pccard_devinfo *));
 
 static struct pccard_device sio_info = {
 	driver_name,