diff options
| author | dsl <dsl@NetBSD.org> | 2009-03-16 23:11:09 +0000 |
|---|---|---|
| committer | dsl <dsl@NetBSD.org> | 2009-03-16 23:11:09 +0000 |
| commit | 7cc9af7d6484d647533e2cc7e39ca9756eef8fe5 (patch) | |
| tree | b42b2e3fa1be867ebdac07c8c6139ccedd917bf0 /sys/dev | |
| parent | fd24f7c9171367d7748eaf9a220cde2ab9311f13 (diff) | |
ANSIfy functions with function-pointer arguments
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/hd44780_subr.c | 9 | ||||
| -rw-r--r-- | sys/dev/isa/ega.c | 11 | ||||
| -rw-r--r-- | sys/dev/mvme/mvmebus.c | 20 | ||||
| -rw-r--r-- | sys/dev/mvme/vme_two_isr.c | 17 | ||||
| -rw-r--r-- | sys/dev/pci/btvmei.c | 20 | ||||
| -rw-r--r-- | sys/dev/pci/btvmeii.c | 20 | ||||
| -rw-r--r-- | sys/dev/pci/tga.c | 15 | ||||
| -rw-r--r-- | sys/dev/pci/universe_pci.c | 11 | ||||
| -rw-r--r-- | sys/dev/sbus/stp4020.c | 11 | ||||
| -rw-r--r-- | sys/dev/sun/disksubr.c | 16 |
10 files changed, 36 insertions, 114 deletions
diff --git a/sys/dev/ic/hd44780_subr.c b/sys/dev/ic/hd44780_subr.c index ea26e8934a6..bbd13baacf1 100644 --- a/sys/dev/ic/hd44780_subr.c +++ b/sys/dev/ic/hd44780_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: hd44780_subr.c,v 1.18 2009/03/14 21:04:20 dsl Exp $ */ +/* $NetBSD: hd44780_subr.c,v 1.19 2009/03/16 23:11:15 dsl Exp $ */ /* * Copyright (c) 2002 Dennis I. Chernoivanov @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.18 2009/03/14 21:04:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.19 2009/03/16 23:11:15 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -254,10 +254,7 @@ hlcd_free_screen(void *v, void *cookie) } static int -hlcd_show_screen(v, cookie, waitok, cb, cbarg) - void *v, *cookie, *cbarg; - int waitok; - void (*cb)(void *, int, int); +hlcd_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg) { struct hlcd_screen *hdscr = v; diff --git a/sys/dev/isa/ega.c b/sys/dev/isa/ega.c index 2a5c2210723..c0ec79796ce 100644 --- a/sys/dev/isa/ega.c +++ b/sys/dev/isa/ega.c @@ -1,4 +1,4 @@ -/* $NetBSD: ega.c,v 1.26 2009/03/14 21:04:20 dsl Exp $ */ +/* $NetBSD: ega.c,v 1.27 2009/03/16 23:11:15 dsl Exp $ */ /* * Copyright (c) 1999 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.26 2009/03/14 21:04:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.27 2009/03/16 23:11:15 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -647,12 +647,7 @@ ega_setfont(struct ega_config *vc, struct egascreen *scr) } static int -ega_show_screen(v, cookie, waitok, cb, cbarg) - void *v; - void *cookie; - int waitok; - void (*cb)(void *, int, int); - void *cbarg; +ega_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg) { struct egascreen *scr = cookie, *oldscr; struct ega_config *vc = scr->cfg; diff --git a/sys/dev/mvme/mvmebus.c b/sys/dev/mvme/mvmebus.c index 023b9a6bf2e..9f13d681ea4 100644 --- a/sys/dev/mvme/mvmebus.c +++ b/sys/dev/mvme/mvmebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvmebus.c,v 1.16 2009/03/14 21:04:21 dsl Exp $ */ +/* $NetBSD: mvmebus.c,v 1.17 2009/03/16 23:11:16 dsl Exp $ */ /*- * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.16 2009/03/14 21:04:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.17 2009/03/16 23:11:16 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -307,14 +307,7 @@ mvmebus_unmap(void *vsc, vme_mapresc_t resc) } int -mvmebus_probe(vsc, vmeaddr, len, am, datasize, callback, arg) - void *vsc; - vme_addr_t vmeaddr; - vme_size_t len; - vme_am_t am; - vme_datasize_t datasize; - int (*callback)(void *, bus_space_tag_t, bus_space_handle_t); - void *arg; +mvmebus_probe(void *vsc, vme_addr_t vmeaddr, vme_size_t len, vme_am_t am, vme_datasize_t datasize, int (*callback)(void *, bus_space_tag_t, bus_space_handle_t), void *arg) { bus_space_tag_t tag; bus_space_handle_t handle; @@ -378,12 +371,7 @@ mvmebus_intr_evcnt(void *vsc, vme_intr_handle_t handle) } void * -mvmebus_intr_establish(vsc, handle, prior, func, arg) - void *vsc; - vme_intr_handle_t handle; - int prior; - int (*func)(void *); - void *arg; +mvmebus_intr_establish(void *vsc, vme_intr_handle_t handle, int prior, int (*func)(void *), void *arg) { struct mvmebus_softc *sc; int level, vector, first; diff --git a/sys/dev/mvme/vme_two_isr.c b/sys/dev/mvme/vme_two_isr.c index ba60e0ae9e2..cf4d3a3a721 100644 --- a/sys/dev/mvme/vme_two_isr.c +++ b/sys/dev/mvme/vme_two_isr.c @@ -1,4 +1,4 @@ -/* $NetBSD: vme_two_isr.c,v 1.14 2009/03/14 21:04:21 dsl Exp $ */ +/* $NetBSD: vme_two_isr.c,v 1.15 2009/03/16 23:11:16 dsl Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.14 2009/03/14 21:04:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.15 2009/03/16 23:11:16 dsl Exp $"); #include "vmetwo.h" @@ -238,11 +238,7 @@ vmetwo_local_isr_trampoline(void *arg) } void -vmetwo_local_intr_establish(pri, vec, hand, arg, evcnt) - int pri, vec; - int (*hand)(void *); - void *arg; - struct evcnt *evcnt; +vmetwo_local_intr_establish(int pri, int vec, int (*hand)(void *), void *arg, struct evcnt *evcnt) { vmetwo_intr_establish(vmetwo_sc, pri, pri, vec, 1, hand, arg, evcnt); @@ -250,12 +246,7 @@ vmetwo_local_intr_establish(pri, vec, hand, arg, evcnt) /* ARGSUSED */ void -vmetwo_intr_establish(csc, prior, lvl, vec, first, hand, arg, evcnt) - void *csc; - int prior, lvl, vec, first; - int (*hand)(void *); - void *arg; - struct evcnt *evcnt; +vmetwo_intr_establish(void *csc, int prior, int lvl, int vec, int first, int (*hand)(void *), void *arg, struct evcnt *evcnt) { struct vmetwo_softc *sc = csc; u_int32_t reg; diff --git a/sys/dev/pci/btvmei.c b/sys/dev/pci/btvmei.c index 9be4523de0c..c240b192ee3 100644 --- a/sys/dev/pci/btvmei.c +++ b/sys/dev/pci/btvmei.c @@ -1,4 +1,4 @@ -/* $NetBSD: btvmei.c,v 1.21 2009/03/14 21:04:21 dsl Exp $ */ +/* $NetBSD: btvmei.c,v 1.22 2009/03/16 23:11:16 dsl Exp $ */ /* * Copyright (c) 1999 @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.21 2009/03/14 21:04:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.22 2009/03/16 23:11:16 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -476,14 +476,7 @@ b3_617_unmap_vme(void *vsc, vme_mapresc_t resc) } int -b3_617_vme_probe(vsc, addr, len, am, datasize, callback, cbarg) - void *vsc; - vme_addr_t addr; - vme_size_t len; - vme_am_t am; - vme_datasize_t datasize; - int (*callback)(void *, bus_space_tag_t, bus_space_handle_t); - void *cbarg; +b3_617_vme_probe(void *vsc, vme_addr_t addr, vme_size_t len, vme_am_t am, vme_datasize_t datasize, int (*callback)(void *, bus_space_tag_t, bus_space_handle_t), void *cbarg) { bus_space_tag_t tag; bus_space_handle_t handle; @@ -555,12 +548,7 @@ b3_617_map_vmeint(void *vsc, int level, int vector, vme_intr_handle_t *handlep) } void * -b3_617_establish_vmeint(vsc, handle, prior, func, arg) - void *vsc; - vme_intr_handle_t handle; - int prior; - int (*func)(void *); - void *arg; +b3_617_establish_vmeint(void *vsc, vme_intr_handle_t handle, int prior, int (*func)(void *), void *arg) { struct b3_617_vmeintrhand *ih; long lv; diff --git a/sys/dev/pci/btvmeii.c b/sys/dev/pci/btvmeii.c index 516a72e33b7..2c6a6e0600b 100644 --- a/sys/dev/pci/btvmeii.c +++ b/sys/dev/pci/btvmeii.c @@ -1,4 +1,4 @@ -/* $NetBSD: btvmeii.c,v 1.16 2009/03/14 21:04:21 dsl Exp $ */ +/* $NetBSD: btvmeii.c,v 1.17 2009/03/16 23:11:16 dsl Exp $ */ /* * Copyright (c) 1999 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.16 2009/03/14 21:04:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.17 2009/03/16 23:11:16 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -367,14 +367,7 @@ b3_2706_unmap_vme(void *vsc, vme_mapresc_t resc) } int -b3_2706_vme_probe(vsc, addr, len, am, datasize, callback, cbarg) - void *vsc; - vme_addr_t addr; - vme_size_t len; - vme_am_t am; - vme_datasize_t datasize; - int (*callback)(void *, bus_space_tag_t, bus_space_handle_t); - void *cbarg; +b3_2706_vme_probe(void *vsc, vme_addr_t addr, vme_size_t len, vme_am_t am, vme_datasize_t datasize, int (*callback)(void *, bus_space_tag_t, bus_space_handle_t), void *cbarg) { bus_space_tag_t tag; bus_space_handle_t handle; @@ -435,12 +428,7 @@ b3_2706_map_vmeint(void *vsc, int level, int vector, vme_intr_handle_t *handlep) } void * -b3_2706_establish_vmeint(vsc, handle, prior, func, arg) - void *vsc; - vme_intr_handle_t handle; - int prior; - int (*func)(void *); - void *arg; +b3_2706_establish_vmeint(void *vsc, vme_intr_handle_t handle, int prior, int (*func)(void *), void *arg) { struct b3_2706_vmeintrhand *ih; long lv; diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index 466d4f0f92c..6b7c5f54555 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $NetBSD: tga.c,v 1.71 2009/03/14 21:04:21 dsl Exp $ */ +/* $NetBSD: tga.c,v 1.72 2009/03/16 23:11:16 dsl Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.71 2009/03/14 21:04:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.72 2009/03/16 23:11:16 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -593,9 +593,7 @@ tga_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l) } static int -tga_sched_update(v, f) - void *v; - void (*f)(void *); +tga_sched_update(void *v, void (*f)(void *)) { struct tga_devconfig *dc = v; @@ -694,12 +692,7 @@ tga_free_screen(void *v, void *cookie) } static int -tga_show_screen(v, cookie, waitok, cb, cbarg) - void *v; - void *cookie; - int waitok; - void (*cb)(void *, int, int); - void *cbarg; +tga_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg) { return (0); diff --git a/sys/dev/pci/universe_pci.c b/sys/dev/pci/universe_pci.c index ed452b5f30b..052317d3f65 100644 --- a/sys/dev/pci/universe_pci.c +++ b/sys/dev/pci/universe_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: universe_pci.c,v 1.9 2009/03/14 21:04:21 dsl Exp $ */ +/* $NetBSD: universe_pci.c,v 1.10 2009/03/16 23:11:16 dsl Exp $ */ /* * Copyright (c) 1999 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.9 2009/03/14 21:04:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.10 2009/03/16 23:11:16 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -87,12 +87,7 @@ static int vmeslvoffsets[8] = { vmeslvoffsets[idx] + offsetof(struct universe_vmeslvimg, reg), val) int -univ_pci_attach(d, pa, name, inthdl, intcookie) - struct univ_pci_data *d; - struct pci_attach_args *pa; - const char *name; - void (*inthdl)(void *, int, int); - void *intcookie; +univ_pci_attach(struct univ_pci_data *d, struct pci_attach_args *pa, const char *name, void (*inthdl)(void *, int, int), void *intcookie) { pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c index b641c0d22b5..db7925047ff 100644 --- a/sys/dev/sbus/stp4020.c +++ b/sys/dev/sbus/stp4020.c @@ -1,4 +1,4 @@ -/* $NetBSD: stp4020.c,v 1.58 2009/03/14 21:04:23 dsl Exp $ */ +/* $NetBSD: stp4020.c,v 1.59 2009/03/16 23:11:16 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.58 2009/03/14 21:04:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.59 2009/03/16 23:11:16 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1035,12 +1035,7 @@ stp4020_chip_socket_disable(pcmcia_chipset_handle_t pch) } void * -stp4020_chip_intr_establish(pch, pf, ipl, handler, arg) - pcmcia_chipset_handle_t pch; - struct pcmcia_function *pf; - int ipl; - int (*handler)(void *); - void *arg; +stp4020_chip_intr_establish(pcmcia_chipset_handle_t pch, struct pcmcia_function *pf, int ipl, int (*handler)(void *), void *arg) { struct stp4020_socket *h = (struct stp4020_socket *)pch; diff --git a/sys/dev/sun/disksubr.c b/sys/dev/sun/disksubr.c index a78ed5475bf..58515352e6f 100644 --- a/sys/dev/sun/disksubr.c +++ b/sys/dev/sun/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.11 2009/03/14 21:04:23 dsl Exp $ */ +/* $NetBSD: disksubr.c,v 1.12 2009/03/16 23:11:16 dsl Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.11 2009/03/14 21:04:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.12 2009/03/16 23:11:16 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,11 +88,7 @@ static int disklabel_bsd_to_sun(struct disklabel *, char *); * Returns null on success and an error string on failure. */ const char * -readdisklabel(dev, strat, lp, clp) - dev_t dev; - void (*strat)(struct buf *); - struct disklabel *lp; - struct cpu_disklabel *clp; +readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp) { struct buf *bp; struct disklabel *dlp; @@ -212,11 +208,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru * Current label is already in clp->cd_block[] */ int -writedisklabel(dev, strat, lp, clp) - dev_t dev; - void (*strat)(struct buf *); - struct disklabel *lp; - struct cpu_disklabel *clp; +writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp) { struct buf *bp; int error; |
