ansi

5 files changed, 24 insertions, 61 deletions

diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 8e68935deb9..9cb83859de7 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_eisa.c,v 1.23 2020/07/05 21:54:44 krw Exp $	*/
+/*	$OpenBSD: ahc_eisa.c,v 1.24 2021/03/07 06:18:48 jsg Exp $	*/
 /*	$NetBSD: ahc_eisa.c,v 1.10 1996/10/21 22:30:58 thorpej Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.23 2020/07/05 21:54:44 krw Exp $
+ *	$Id: ahc_eisa.c,v 1.24 2021/03/07 06:18:48 jsg Exp $
  */
 
 #include <sys/param.h>
@@ -67,9 +67,7 @@ struct cfattach ahc_eisa_ca = {
  * Return irq setting of the board, otherwise -1.
  */
 int
-ahc_eisa_irq(iot, ioh)
-bus_space_tag_t iot;
-bus_space_handle_t ioh;
+ahc_eisa_irq(bus_space_tag_t iot, bus_space_handle_t ioh)
 {
 	int irq;
 	u_char intdef;
@@ -103,9 +101,7 @@ bus_space_handle_t ioh;
  * the actual probe routine to check it out.
  */
 int
-ahc_eisa_match(parent, match, aux)
-struct device *parent;
-void *match, *aux;
+ahc_eisa_match(struct device *parent, void *match, void *aux)
 {
 	struct eisa_attach_args *ea = aux;
 	bus_space_tag_t iot = ea->ea_iot;
@@ -134,9 +130,7 @@ void *match, *aux;
 }
 
 void
-ahc_eisa_attach(parent, self, aux)
-struct device *parent, *self;
-void *aux;
+ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct ahc_softc *ahc = (void *)self;
 	struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index ff6f85d47ac..ebf49b78e92 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac_eisa.c,v 1.5 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: cac_eisa.c,v 1.6 2021/03/07 06:18:48 jsg Exp $	*/
 /*	$NetBSD: cac_eisa.c,v 1.1 2000/09/01 12:15:20 ad Exp $	*/
 
 /*-
@@ -118,9 +118,7 @@ struct cac_eisa_type {
 };
 
 int
-cac_eisa_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+cac_eisa_match(struct device *parent, void *match, void *aux)
 {
 	struct eisa_attach_args *ea;
 	int i;
@@ -135,10 +133,7 @@ cac_eisa_match(parent, match, aux)
 }
 
 void
-cac_eisa_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
+cac_eisa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct eisa_attach_args *ea;
 	bus_space_handle_t ioh;
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index 6762c7eec8a..d352f765f32 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa.c,v 1.13 2009/03/29 21:53:52 sthen Exp $	*/
+/*	$OpenBSD: eisa.c,v 1.14 2021/03/07 06:18:48 jsg Exp $	*/
 /*	$NetBSD: eisa.c,v 1.15 1996/10/21 22:31:01 thorpej Exp $	*/
 
 /*
@@ -65,9 +65,7 @@ int	eisaprint(void *, const char *);
 void	eisa_devinfo(const char *, char *, size_t);
 
 int
-eisamatch(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+eisamatch(struct device *parent, void *match, void *aux)
 {
 	struct cfdata *cf = match;
 	struct eisabus_attach_args *eba = aux;
@@ -81,9 +79,7 @@ eisamatch(parent, match, aux)
 }
 
 int
-eisaprint(aux, pnp)
-	void *aux;
-	const char *pnp;
+eisaprint(void *aux, const char *pnp)
 {
 	register struct eisa_attach_args *ea = aux;
 	char devinfo[256]; 
@@ -97,9 +93,7 @@ eisaprint(aux, pnp)
 }
 
 int
-eisasubmatch(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+eisasubmatch(struct device *parent, void *match, void *aux)
 {
 	struct cfdata *cf = match;
 	struct eisa_attach_args *ea = aux;
@@ -111,9 +105,7 @@ eisasubmatch(parent, match, aux)
 }
 
 void
-eisaattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+eisaattach(struct device *parent, struct device *self, void *aux)
 {
 	struct eisabus_attach_args *eba = aux;
 	bus_space_tag_t iot, memt;
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index 67a9e1cf2e1..d5d23c2ec0f 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_eisa.c,v 1.26 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_ep_eisa.c,v 1.27 2021/03/07 06:18:48 jsg Exp $	*/
 /*	$NetBSD: if_ep_eisa.c,v 1.13 1997/04/18 00:50:33 cgd Exp $	*/
 
 /*
@@ -83,9 +83,7 @@ struct cfattach ep_eisa_ca = {
 #define EISA_ENABLE	0x01
 
 int
-ep_eisa_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+ep_eisa_match(struct device *parent, void *match, void *aux)
 {
 	struct eisa_attach_args *ea = aux;
 
@@ -107,9 +105,7 @@ ep_eisa_match(parent, match, aux)
 }
 
 void
-ep_eisa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+ep_eisa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct ep_softc *sc = (void *)self;
 	struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index 9d2fe688bf1..53763bb40ec 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha_eisa.c,v 1.14 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: uha_eisa.c,v 1.15 2021/03/07 06:18:48 jsg Exp $	*/
 /*	$NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $	*/
 
 /*
@@ -72,9 +72,7 @@ void u24_init(struct uha_softc *);
  * the actual probe routine to check it out.
  */
 int
-uha_eisa_match(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
+uha_eisa_match(struct device *parent, void *match, void *aux)
 {
 	struct eisa_attach_args *ea = aux;
 	bus_space_tag_t iot = ea->ea_iot;
@@ -100,9 +98,7 @@ uha_eisa_match(parent, match, aux)
  * Attach all the sub-devices we can find
  */
 void
-uha_eisa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+uha_eisa_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct eisa_attach_args *ea = aux;
 	struct uha_softc *sc = (void *)self;
@@ -154,10 +150,7 @@ uha_eisa_attach(parent, self, aux)
 }
 
 int
-u24_find(iot, ioh, sc)
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	struct uha_softc *sc;
+u24_find(bus_space_tag_t iot, bus_space_handle_t ioh, struct uha_softc *sc)
 {
 	u_int8_t config0, config1, config2;
 	int irq, drq;
@@ -214,9 +207,7 @@ u24_find(iot, ioh, sc)
 }
 
 void
-u24_start_mbox(sc, mscp)
-	struct uha_softc *sc;
-	struct uha_mscp *mscp;
+u24_start_mbox(struct uha_softc *sc, struct uha_mscp *mscp)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -243,10 +234,7 @@ u24_start_mbox(sc, mscp)
 }
 
 int
-u24_poll(sc, xs, count)
-	struct uha_softc *sc;
-	struct scsi_xfer *xs;
-	int count;
+u24_poll(struct uha_softc *sc, struct scsi_xfer *xs, int count)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;
@@ -271,8 +259,7 @@ u24_poll(sc, xs, count)
 }
 
 int
-u24_intr(arg)
-	void *arg;
+u24_intr(void *arg)
 {
 	struct uha_softc *sc = arg;
 	bus_space_tag_t iot = sc->sc_iot;
@@ -320,8 +307,7 @@ u24_intr(arg)
 }
 
 void
-u24_init(sc)
-	struct uha_softc *sc;
+u24_init(struct uha_softc *sc)
 {
 	bus_space_tag_t iot = sc->sc_iot;
 	bus_space_handle_t ioh = sc->sc_ioh;