3 files changed, 11 insertions, 29 deletions
diff --git a/sys/dev/isa/if_an_isapnp.c b/sys/dev/isa/if_an_isapnp.c
index 28d1151c9f8..59ac74e66d9 100644
--- a/sys/dev/isa/if_an_isapnp.c
+++ b/sys/dev/isa/if_an_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_an_isapnp.c,v 1.8 2006/01/30 11:41:00 jsg Exp $	*/
+/*	$OpenBSD: if_an_isapnp.c,v 1.9 2006/03/10 00:27:55 jsg Exp $	*/
 
 /*
  * Copyright (c) 2003 Michael Shalayeff
@@ -59,17 +59,13 @@ struct cfattach an_isapnp_ca = {
 };
 
 int
-an_isapnp_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+an_isapnp_match(struct device *parent, void *match, void *aux)
 {
 	return 1;
 }
 
 void
-an_isapnp_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+an_isapnp_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct an_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c
index f3351b2bb78..b3608b11364 100644
--- a/sys/dev/pci/if_an_pci.c
+++ b/sys/dev/pci/if_an_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_an_pci.c,v 1.15 2006/01/30 11:41:00 jsg Exp $	*/
+/*	$OpenBSD: if_an_pci.c,v 1.16 2006/03/10 00:27:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -99,20 +99,14 @@ const struct pci_matchid an_pci_devices[] = {
 };
 
 int
-an_pci_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
+an_pci_match(struct device *parent, void *match, void *aux)
 {
 	return (pci_matchbyid((struct pci_attach_args *)aux, an_pci_devices,
 	    sizeof(an_pci_devices)/sizeof(an_pci_devices[0])));
 }
 
 void
-an_pci_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
+an_pci_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct an_softc *sc = (struct an_softc *)self;
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index a45b507e32f..96aca9d68ea 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_an_pcmcia.c,v 1.18 2006/01/30 11:41:00 jsg Exp $	*/
+/*	$OpenBSD: if_an_pcmcia.c,v 1.19 2006/03/10 00:27:55 jsg Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -75,9 +75,7 @@ struct cfattach an_pcmcia_ca = {
 };
 
 int
-an_pcmcia_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+an_pcmcia_match(struct device *parent, void *match, void *aux)
 {
 	struct pcmcia_attach_args *pa = aux;
 
@@ -98,9 +96,7 @@ an_pcmcia_match(parent, match, aux)
 }
 
 void
-an_pcmcia_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+an_pcmcia_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct an_pcmcia_softc *psc = (struct an_pcmcia_softc *)self;
 	struct an_softc *sc = (struct an_softc *)self;
@@ -155,9 +151,7 @@ an_pcmcia_attach(parent, self, aux)
 }
 
 int
-an_pcmcia_detach(dev, flags)
-	struct device *dev;
-	int flags;
+an_pcmcia_detach(struct device *dev, int flags)
 {
 	struct an_pcmcia_softc *psc = (struct an_pcmcia_softc *)dev;
 	int error;
@@ -176,9 +170,7 @@ an_pcmcia_detach(dev, flags)
 }
 
 int
-an_pcmcia_activate(dev, act)
-	struct device *dev;
-	enum devact act;
+an_pcmcia_activate(struct device *dev, enum devact act)
 {
 	struct an_pcmcia_softc *psc = (struct an_pcmcia_softc *)dev;
 	struct an_softc *sc = &psc->sc_an;