From 06cae3775af3f9bdfe23a8429695807e320f4f77 Mon Sep 17 00:00:00 2001 From: jsg Date: Tue, 28 May 2024 05:46:32 +0000 Subject: [PATCH] use ansi style function decls to fix build with clang --- sys/dev/isa/addcom_isa.c | 17 +++++------------ sys/dev/isa/boca.c | 18 +++++------------- sys/dev/isa/hsq.c | 18 +++++------------- 3 files changed, 15 insertions(+), 38 deletions(-) diff --git a/sys/dev/isa/addcom_isa.c b/sys/dev/isa/addcom_isa.c index 65752117b2a..da5afd18583 100644 --- a/sys/dev/isa/addcom_isa.c +++ b/sys/dev/isa/addcom_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addcom_isa.c,v 1.7 2022/04/06 18:59:28 naddy Exp $ */ +/* $OpenBSD: addcom_isa.c,v 1.8 2024/05/28 05:46:32 jsg Exp $ */ /* $NetBSD: addcom_isa.c,v 1.2 2000/04/21 20:13:41 explorer Exp $ */ /* @@ -120,9 +120,7 @@ struct cfdriver addcom_cd = { }; int -addcomprobe(parent, self, aux) - struct device *parent; - void *self, *aux; +addcomprobe(struct device *parent, void *self, void *aux) { struct isa_attach_args *ia = aux; int iobase = ia->ia_iobase; @@ -175,9 +173,7 @@ out: } int -addcomprint(aux, pnp) - void *aux; - const char *pnp; +addcomprint(void *aux, const char *pnp) { struct commulti_attach_args *ca = aux; @@ -188,9 +184,7 @@ addcomprint(aux, pnp) } void -addcomattach(parent, self, aux) - struct device *parent, *self; - void *aux; +addcomattach(struct device *parent, struct device *self, void *aux) { struct addcom_softc *sc = (void *)self; struct isa_attach_args *ia = aux; @@ -253,8 +247,7 @@ addcomattach(parent, self, aux) } int -addcomintr(arg) - void *arg; +addcomintr(void *arg) { struct addcom_softc *sc = arg; int intrd, r = 0, i; diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c index 111dea29ec4..414634ee9b9 100644 --- a/sys/dev/isa/boca.c +++ b/sys/dev/isa/boca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boca.c,v 1.17 2022/04/06 18:59:28 naddy Exp $ */ +/* $OpenBSD: boca.c,v 1.18 2024/05/28 05:46:32 jsg Exp $ */ /* $NetBSD: boca.c,v 1.15 1996/05/12 23:51:50 mycroft Exp $ */ /* @@ -74,10 +74,7 @@ struct cfdriver boca_cd = { }; int -bocaprobe(parent, self, aux) - struct device *parent; - void *self; - void *aux; +bocaprobe(struct device *parent, void *self, void *aux) { struct isa_attach_args *ia = aux; int iobase = ia->ia_iobase; @@ -126,9 +123,7 @@ out: } int -bocaprint(aux, pnp) - void *aux; - const char *pnp; +bocaprint(void *aux, const char *pnp) { struct commulti_attach_args *ca = aux; @@ -139,9 +134,7 @@ bocaprint(aux, pnp) } void -bocaattach(parent, self, aux) - struct device *parent, *self; - void *aux; +bocaattach(struct device *parent, struct device *self, void *aux) { struct boca_softc *sc = (void *)self; struct isa_attach_args *ia = aux; @@ -177,8 +170,7 @@ bocaattach(parent, self, aux) } int -bocaintr(arg) - void *arg; +bocaintr(void *arg) { struct boca_softc *sc = arg; bus_space_tag_t iot = sc->sc_iot; diff --git a/sys/dev/isa/hsq.c b/sys/dev/isa/hsq.c index f1e2d2d65e5..b8f401fb0a3 100644 --- a/sys/dev/isa/hsq.c +++ b/sys/dev/isa/hsq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hsq.c,v 1.7 2022/04/06 18:59:28 naddy Exp $ */ +/* $OpenBSD: hsq.c,v 1.8 2024/05/28 05:46:32 jsg Exp $ */ /*- * Copyright (c) 1999 Denis A. Doroshenko. All rights reserved. @@ -120,10 +120,7 @@ struct cfdriver hsq_cd = { }; int -hsqprobe(parent, self, aux) - struct device *parent; - void *self; - void *aux; +hsqprobe(struct device *parent, void *self, void *aux) { struct isa_attach_args *ia = aux; int iobase = ia->ia_iobase; @@ -174,9 +171,7 @@ out: } int -hsqprint(aux, pnp) - void *aux; - const char *pnp; +hsqprint(void *aux, const char *pnp) { struct commulti_attach_args *ca = aux; @@ -187,9 +182,7 @@ hsqprint(aux, pnp) } void -hsqattach(parent, self, aux) - struct device *parent, *self; - void *aux; +hsqattach(struct device *parent, struct device *self, void *aux) { struct hsq_softc *sc = (void *)self; struct isa_attach_args *ia = aux; @@ -225,8 +218,7 @@ hsqattach(parent, self, aux) } int -hsqintr(arg) - void *arg; +hsqintr(void *arg) { struct hsq_softc *sc = arg; bus_space_tag_t iot = sc->sc_iot; -- 2.20.1