summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/osiop.c4
-rw-r--r--sys/dev/ic/siop.c4
-rw-r--r--sys/dev/isa/opti.c4
-rw-r--r--sys/dev/isa/spkr.c4
-rw-r--r--sys/dev/rasops/rasops_masks.c4
-rw-r--r--sys/dev/usb/if_udav.c8
-rw-r--r--sys/dev/usb/if_url.c8
-rw-r--r--sys/dev/wscons/wsdisplay.c6
-rw-r--r--sys/dev/wscons/wskbd.c6
9 files changed, 18 insertions, 30 deletions
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 50a315b4495..d933010bb12 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: osiop.c,v 1.47 2011/01/02 13:38:27 miod Exp $ */
+/* $OpenBSD: osiop.c,v 1.48 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $ */
/*
@@ -1967,7 +1967,7 @@ osiop_timeout(arg)
#if OSIOP_TRACE_SIZE
void
-osiop_dump_trace()
+osiop_dump_trace(void)
{
int i;
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index 7672430af98..9cf5af91da5 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siop.c,v 1.64 2011/04/05 22:37:39 dlg Exp $ */
+/* $OpenBSD: siop.c,v 1.65 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */
/*
@@ -2212,7 +2212,7 @@ siop_scsifree(struct scsi_link *link)
#ifdef SIOP_STATS
void
-siop_printstats()
+siop_printstats(void)
{
printf("siop_stat_intr %d\n", siop_stat_intr);
printf("siop_stat_intr_shortxfer %d\n", siop_stat_intr_shortxfer);
diff --git a/sys/dev/isa/opti.c b/sys/dev/isa/opti.c
index e55d4151361..8211dd9e806 100644
--- a/sys/dev/isa/opti.c
+++ b/sys/dev/isa/opti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: opti.c,v 1.8 2004/06/13 21:49:24 niklas Exp $ */
+/* $OpenBSD: opti.c,v 1.9 2011/06/23 16:31:16 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -209,7 +209,7 @@ opti_inb(port)
}
static int
-opti_present()
+opti_present(void)
{
register u_char a, b;
int s = splhigh();
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 3081c656223..9e19102606f 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkr.c,v 1.12 2009/12/04 09:49:21 jasper Exp $ */
+/* $OpenBSD: spkr.c,v 1.13 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
/*
@@ -171,7 +171,7 @@ static int pitchtab[] =
#define NOCTAVES (sizeof(pitchtab) / sizeof(pitchtab[0]) / OCTAVE_NOTES)
static void
-playinit()
+playinit(void)
{
octave = DFLT_OCTAVE;
whole = (hz * SECS_PER_MIN * WHOLE_NOTE) / DFLT_TEMPO;
diff --git a/sys/dev/rasops/rasops_masks.c b/sys/dev/rasops/rasops_masks.c
index 4cfb34cf953..d45616c0315 100644
--- a/sys/dev/rasops/rasops_masks.c
+++ b/sys/dev/rasops/rasops_masks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rasops_masks.c,v 1.4 2008/06/26 05:42:18 ray Exp $ */
+/* $OpenBSD: rasops_masks.c,v 1.5 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: rasops_masks.c,v 1.5 2000/06/13 13:37:00 ad Exp $ */
/*-
@@ -358,7 +358,7 @@ int32_t rasops_pmask[32][32] = {
#if BYTE_ORDER != BIG_ENDIAN
void
-rasops_masks_init()
+rasops_masks_init(void)
{
static int flipped = 0;
u_int i;
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 25728b5a4a7..50f7f0140a1 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.55 2011/03/31 17:06:25 mk Exp $ */
+/* $OpenBSD: if_udav.c,v 1.56 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -1192,12 +1192,6 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTF(("%s: %s: start rx\n", sc->sc_dev.dv_xname, __func__));
}
-#if 0
-void udav_intr()
-{
-}
-#endif
-
int
udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index af6381b5fa6..3f57d55a65b 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.61 2011/01/25 20:03:35 jakemsr Exp $ */
+/* $OpenBSD: if_url.c,v 1.62 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -1056,12 +1056,6 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTF(("%s: %s: start rx\n", sc->sc_dev.dv_xname, __func__));
}
-#if 0
-void url_intr()
-{
-}
-#endif
-
int
url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 7539cda23e7..70b169b2494 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.103 2010/11/20 20:52:10 miod Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.104 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -2167,7 +2167,7 @@ wsdisplay_set_cons_kbd(int (*get)(dev_t), void (*poll)(dev_t, int),
}
void
-wsdisplay_unset_cons_kbd()
+wsdisplay_unset_cons_kbd(void)
{
wsdisplay_cons.cn_getc = wsdisplay_getc_dummy;
wsdisplay_cons.cn_bell = NULL;
@@ -2178,7 +2178,7 @@ wsdisplay_unset_cons_kbd()
* Switch the console display to its first screen.
*/
void
-wsdisplay_switchtoconsole()
+wsdisplay_switchtoconsole(void)
{
struct wsdisplay_softc *sc;
struct wsscreen *scr;
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index a8346df58bf..220f61aa28f 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.67 2011/06/06 06:13:46 deraadt Exp $ */
+/* $OpenBSD: wskbd.c,v 1.68 2011/06/23 16:31:16 deraadt Exp $ */
/* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
/*
@@ -478,7 +478,7 @@ wskbd_cnattach(const struct wskbd_consops *consops, void *conscookie,
}
void
-wskbd_cndetach()
+wskbd_cndetach(void)
{
KASSERT(wskbd_console_initted);
@@ -1138,7 +1138,7 @@ wskbdpoll(dev_t dev, int events, struct proc *p)
#if NWSDISPLAY > 0
int
-wskbd_pickfree()
+wskbd_pickfree(void)
{
int i;
struct wskbd_softc *sc;