diff options
Diffstat (limited to 'sys')
34 files changed, 99 insertions, 99 deletions
diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c index b73fac621c5..6ff87cdddd3 100644 --- a/sys/arch/alpha/tc/scc.c +++ b/sys/arch/alpha/tc/scc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scc.c,v 1.11 2002/01/16 20:50:16 miod Exp $ */ +/* $OpenBSD: scc.c,v 1.12 2002/02/15 20:45:29 nordin Exp $ */ /* $NetBSD: scc.c,v 1.28 1996/12/05 01:39:43 cgd Exp $ */ /* @@ -1217,7 +1217,7 @@ sccmctl(dev, bits, how) break; case DMGET: - (void) splx(s); + splx(s); return (mbits); } if (line == SCC_CHANNEL_B) { @@ -1230,7 +1230,7 @@ sccmctl(dev, bits, how) } if ((mbits & DML_DTR) || (sc->scc_softCAR & (1 << line))) sc->scc_tty[line]->t_state |= TS_CARR_ON; - (void) splx(s); + splx(s); return (mbits); } diff --git a/sys/arch/amiga/dev/mfc.c b/sys/arch/amiga/dev/mfc.c index 3d6cd5b62e5..b2f2ac06a8c 100644 --- a/sys/arch/amiga/dev/mfc.c +++ b/sys/arch/amiga/dev/mfc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfc.c,v 1.10 1997/01/16 09:25:01 niklas Exp $ */ +/* $OpenBSD: mfc.c,v 1.11 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: mfc.c,v 1.18 1996/12/23 09:10:23 veego Exp $ */ /* @@ -937,7 +937,7 @@ mfcsmctl(dev, bits, how) ub = ~sc->sc_regs->du_ip; break; } - (void)splx(s); + splx(s); /* XXXX should keep DTR & RTS states in softc? */ bits = TIOCM_DTR | TIOCM_RTS; diff --git a/sys/arch/amiga/dev/msc.c b/sys/arch/amiga/dev/msc.c index eb4d51d4836..742eecf29e8 100644 --- a/sys/arch/amiga/dev/msc.c +++ b/sys/arch/amiga/dev/msc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msc.c,v 1.6 1997/01/16 09:25:04 niklas Exp $ */ +/* $OpenBSD: msc.c,v 1.7 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: msc.c,v 1.13 1996/12/23 09:10:26 veego Exp $ */ /* @@ -1129,7 +1129,7 @@ mscmctl(dev, bits, how) bits = msc->flags; - (void) splx(s); + splx(s); return(bits); } diff --git a/sys/arch/amiga/dev/ser.c b/sys/arch/amiga/dev/ser.c index 6463c9519c8..c912f731ba2 100644 --- a/sys/arch/amiga/dev/ser.c +++ b/sys/arch/amiga/dev/ser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ser.c,v 1.10 2002/01/30 20:45:34 nordin Exp $ */ +/* $OpenBSD: ser.c,v 1.11 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: ser.c,v 1.43 1998/01/12 10:40:11 thorpej Exp $ */ /* @@ -1047,7 +1047,7 @@ sermctl(dev, bits, how) ub = ~ciab.pra; break; } - (void)splx(s); + splx(s); bits = 0; if (ISSET(ub, CIAB_PRA_DTR)) diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c index 11e06aa1345..506484a74ba 100644 --- a/sys/arch/hp300/dev/dca.c +++ b/sys/arch/hp300/dev/dca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dca.c,v 1.13 2001/09/23 07:05:06 millert Exp $ */ +/* $OpenBSD: dca.c,v 1.14 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */ /* @@ -935,7 +935,7 @@ dcamctl(sc, bits, how) bits = dca->dca_msr; break; } - (void) splx(s); + splx(s); return (bits); } diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c index 184ac74c678..e37846cf27f 100644 --- a/sys/arch/hp300/dev/dcm.c +++ b/sys/arch/hp300/dev/dcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dcm.c,v 1.11 1997/09/14 03:43:03 downsj Exp $ */ +/* $OpenBSD: dcm.c,v 1.12 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */ /* @@ -1339,7 +1339,7 @@ dcmmctl(dev, bits, how) dcm->dcm_cr |= CR_MODM; SEM_UNLOCK(dcm); DELAY(10); /* delay until done */ - (void) splx(s); + splx(s); } return (bits); } diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c index a93ad40172e..d8bab8503d2 100644 --- a/sys/arch/hp300/dev/mt.c +++ b/sys/arch/hp300/dev/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.7 2001/05/01 16:51:10 millert Exp $ */ +/* $OpenBSD: mt.c,v 1.8 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $ */ /* @@ -509,7 +509,7 @@ spl_mtintr(arg) hpibppclear(sc->sc_hpibno); mtintr(sc); - (void) splx(s); + splx(s); } void @@ -519,7 +519,7 @@ spl_mtstart(arg) int s = splbio(); mtstart(arg); - (void) splx(s); + splx(s); } void diff --git a/sys/arch/mvme68k/dev/bugtty.c b/sys/arch/mvme68k/dev/bugtty.c index 15f3ee7265d..aa88ca53765 100644 --- a/sys/arch/mvme68k/dev/bugtty.c +++ b/sys/arch/mvme68k/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.4 1996/06/11 10:17:29 deraadt Exp $ */ +/* $OpenBSD: bugtty.c,v 1.5 2002/02/15 20:45:30 nordin Exp $ */ /* * Copyright (c) 1995 Dale Rahn. @@ -144,7 +144,7 @@ bugttymctl(dev, bits, how) case DMGET: break; } - (void)splx(s); + splx(s); bits = 0; /* proper defaults? */ diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c index 0e887d78b42..a84881a26a4 100644 --- a/sys/arch/mvme68k/dev/cl.c +++ b/sys/arch/mvme68k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.22 2001/06/27 05:44:47 nate Exp $ */ +/* $OpenBSD: cl.c,v 1.23 2002/02/15 20:45:30 nordin Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -511,7 +511,7 @@ int clmctl (dev, bits, how) } break; } - (void)splx(s); + splx(s); #if 0 bits = 0; /* proper defaults? */ diff --git a/sys/arch/mvme68k/dev/wl.c b/sys/arch/mvme68k/dev/wl.c index 53a89050f72..dbfd421bf43 100644 --- a/sys/arch/mvme68k/dev/wl.c +++ b/sys/arch/mvme68k/dev/wl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wl.c,v 1.5 2001/06/27 05:44:48 nate Exp $ */ +/* $OpenBSD: wl.c,v 1.6 2002/02/15 20:45:30 nordin Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -486,7 +486,7 @@ int clmctl (dev, bits, how) } break; } - (void)splx(s); + splx(s); #if 0 bits = 0; /* proper defaults? */ diff --git a/sys/arch/mvme88k/dev/bugtty.c b/sys/arch/mvme88k/dev/bugtty.c index 70bce2af151..38682dcbc68 100644 --- a/sys/arch/mvme88k/dev/bugtty.c +++ b/sys/arch/mvme88k/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.9 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: bugtty.c,v 1.10 2002/02/15 20:45:30 nordin Exp $ */ /* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. * All rights reserved. @@ -164,7 +164,7 @@ int case DMGET: break; } - (void)splx(s); + splx(s); bits = 0; /* proper defaults? */ diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c index 3ed083971df..36ccbc0028d 100644 --- a/sys/arch/mvme88k/dev/cl.c +++ b/sys/arch/mvme88k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.20 2002/01/14 21:34:38 miod Exp $ */ +/* $OpenBSD: cl.c,v 1.21 2002/02/15 20:45:30 nordin Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -497,7 +497,7 @@ int clmctl (dev, bits, how) } break; } - (void)splx(s); + splx(s); #if 0 bits = 0; /* proper defaults? */ diff --git a/sys/arch/mvmeppc/dev/bugtty.c b/sys/arch/mvmeppc/dev/bugtty.c index 0b919b28a54..6a7a8350a23 100644 --- a/sys/arch/mvmeppc/dev/bugtty.c +++ b/sys/arch/mvmeppc/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.2 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: bugtty.c,v 1.3 2002/02/15 20:45:30 nordin Exp $ */ /* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. * All rights reserved. @@ -153,7 +153,7 @@ bugttymctl(dev, bits, how) case DMGET: break; } - (void)splx(s); + splx(s); bits = 0; /* proper defaults? */ diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index d0c2c336793..c9ba0bc7899 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.47 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.48 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -1269,7 +1269,7 @@ mainbus_attach(parent, dev, aux) if (strcmp(cp, "zs") == 0) autoconf_nzs++; if (/*audio &&*/ autoconf_nzs >= 2) /*XXX*/ - (void) splx(11 << 8); /*XXX*/ + splx(11 << 8); /*XXX*/ #endif oca.ca_bustype = BUS_MAIN; (void) config_found(dev, (void *)&oca, mbprint); diff --git a/sys/arch/vax/qbus/dhu.c b/sys/arch/vax/qbus/dhu.c index 69ba4cd0271..dcdff248727 100644 --- a/sys/arch/vax/qbus/dhu.c +++ b/sys/arch/vax/qbus/dhu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhu.c,v 1.2 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: dhu.c,v 1.3 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: dhu.c,v 1.17 2000/01/24 02:40:28 matt Exp $ */ /* * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. @@ -381,7 +381,7 @@ dhuopen(dev, flag, mode, p) s = spltty(); DHU_WRITE_BYTE(DHU_UBA_CSR, DHU_CSR_RXIE | line); sc->sc_dhu[line].dhu_modem = DHU_READ_WORD(DHU_UBA_STAT); - (void) splx(s); + splx(s); tp = sc->sc_dhu[line].dhu_tty; @@ -413,7 +413,7 @@ dhuopen(dev, flag, mode, p) if (error) break; } - (void) splx(s); + splx(s); if (error) return (error); return ((*linesw[tp->t_line].l_open)(dev, tp)); @@ -583,7 +583,7 @@ dhustop(tp, flag) if (!(tp->t_state & TS_TTSTOP)) tp->t_state |= TS_FLUSH; } - (void) splx(s); + splx(s); } static void @@ -645,7 +645,7 @@ dhustart(tp) DHU_READ_WORD(DHU_UBA_TBUFAD2) | DHU_TBUFAD2_DMA_START); } out: - (void) splx(s); + splx(s); return; } @@ -736,7 +736,7 @@ dhuparam(tp, t) DHU_WRITE_WORD(DHU_UBA_LNCTRL, lnctrl); - (void) splx(s); + splx(s); return (0); } @@ -816,7 +816,7 @@ dhumctl(sc, line, bits, how) break; case DMGET: - (void) splx(s); + splx(s); return (mbits); } @@ -837,6 +837,6 @@ dhumctl(sc, line, bits, how) DHU_WRITE_WORD(DHU_UBA_LNCTRL, lnctrl); - (void) splx(s); + splx(s); return (mbits); } diff --git a/sys/arch/vax/qbus/dz.c b/sys/arch/vax/qbus/dz.c index 018476a174b..d31dfe75d8f 100644 --- a/sys/arch/vax/qbus/dz.c +++ b/sys/arch/vax/qbus/dz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dz.c,v 1.7 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: dz.c,v 1.8 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: dz.c,v 1.23 2000/06/04 02:14:12 matt Exp $ */ /* * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. @@ -329,7 +329,7 @@ dzopen(dev_t dev, int flag, int mode, struct proc *p) if (error) break; } - (void) splx(s); + splx(s); if (error) return (error); return ((*linesw[tp->t_line].l_open)(dev, tp)); @@ -558,7 +558,7 @@ dzparam(struct tty *tp, struct termios *t) DZ_WRITE_WORD(dr_lpr, lpr); - (void) splx(s); + splx(s); return (0); } @@ -613,7 +613,7 @@ dzmctl(struct dz_softc *sc, int line, int bits, int how) break; case DMGET: - (void) splx(s); + splx(s); return (mbits); } @@ -631,7 +631,7 @@ dzmctl(struct dz_softc *sc, int line, int bits, int how) DZ_WRITE_BYTE(dr_break, sc->sc_brk); } - (void) splx(s); + splx(s); return (mbits); } @@ -692,7 +692,7 @@ dzscan(void *arg) sc->sc_rxint = 0; } - (void) splx(s); + splx(s); timeout_add(&dz_timeout, hz); return; } diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c index 61cf74b5959..6af1c7de714 100644 --- a/sys/arch/vax/uba/ts.c +++ b/sys/arch/vax/uba/ts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts.c,v 1.5 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: ts.c,v 1.6 2002/02/15 20:45:30 nordin Exp $ */ /* $NetBSD: ts.c,v 1.11 1997/01/11 11:34:43 ragge Exp $ */ /*- @@ -1124,11 +1124,11 @@ tsopen (dev, flag, type, p) s = splbio (); if (sc->sc_state < ST_RUNNING) { /* XXX */ printf ("%s not running.\n", sc->sc_dev.dv_xname); - (void) splx (s); + splx(s); sc->sc_openf = 0; return (ENXIO); } - (void) splx (s); + splx(s); /* * check if transport is really online. diff --git a/sys/arch/vax/vsa/dc.c b/sys/arch/vax/vsa/dc.c index 2080bef1320..746b206d73c 100644 --- a/sys/arch/vax/vsa/dc.c +++ b/sys/arch/vax/vsa/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.5 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: dc.c,v 1.6 2002/02/15 20:45:31 nordin Exp $ */ /* $NetBSD: dc.c,v 1.4 1996/10/13 03:36:10 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -842,7 +842,7 @@ dcmctl(dev, bits, how) break; case DMGET: - (void) splx(s); + splx(s); return (mbits); } switch (unit & 03) { @@ -863,7 +863,7 @@ dcmctl(dev, bits, how) } if ((mbits & DML_DTR) && (dcsoftCAR[unit >> 2] & b)) dc_tty[unit]->t_state |= TS_CARR_ON; - (void) splx(s); + splx(s); return (mbits); } diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index 2f1c367faa4..036d3ccde75 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.44 2001/12/13 17:43:02 nate Exp $ */ +/* $OpenBSD: dc.c,v 1.45 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2804,7 +2804,7 @@ void dc_init(xsc) printf("dc%d: initialization failed: no " "memory for rx buffers\n", sc->dc_unit); dc_stop(sc); - (void)splx(s); + splx(s); return; } @@ -2859,7 +2859,7 @@ void dc_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - (void)splx(s); + splx(s); timeout_set(&sc->dc_tick_tmo, dc_tick, sc); @@ -3019,7 +3019,7 @@ int dc_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index bc1f57e079b..9488d50df62 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.30 2001/11/06 19:53:18 miod Exp $ */ +/* $OpenBSD: fxp.c,v 1.31 2002/02/15 20:45:31 nordin Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -1548,7 +1548,7 @@ fxp_ioctl(ifp, command, data) default: error = EINVAL; } - (void) splx(s); + splx(s); return (error); } diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 265cb6523c4..dc75c027e1b 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9.c,v 1.12 2002/01/08 05:38:53 fgsch Exp $ */ +/* $OpenBSD: rtl81x9.c,v 1.13 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1028,7 +1028,7 @@ void rl_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - (void)splx(s); + splx(s); timeout_set(&sc->sc_tick_tmo, rl_tick, sc); timeout_add(&sc->sc_tick_tmo, hz); @@ -1132,7 +1132,7 @@ int rl_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index f0d053ea8d1..50050e42c4f 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.33 2002/01/25 05:44:06 nordin Exp $ */ +/* $OpenBSD: xl.c,v 1.34 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2099,7 +2099,7 @@ void xl_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - (void)splx(s); + splx(s); timeout_add(&sc->xl_stsup_tmo, hz); @@ -2323,7 +2323,7 @@ xl_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 8f1449f4f8b..ab473540808 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.5 2002/01/11 01:31:21 nordin Exp $ */ +/* $OpenBSD: if_bge.c,v 1.6 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -2529,7 +2529,7 @@ bge_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index b1945b8faf3..1ab0c361833 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.6 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_lge.c,v 1.7 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -1348,7 +1348,7 @@ void lge_init(xsc) printf("%s: initialization failed: no " "memory for rx buffers\n", sc->sc_dv.dv_xname); lge_stop(sc); - (void)splx(s); + splx(s); return; } @@ -1445,7 +1445,7 @@ void lge_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - (void)splx(s); + splx(s); timeout_add(&sc->lge_timeout, hz); @@ -1570,7 +1570,7 @@ int lge_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index dd5730c2dc6..df73635c912 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.15 2001/11/13 21:00:16 mickey Exp $ */ +/* $OpenBSD: if_nge.c,v 1.16 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -1689,7 +1689,7 @@ void nge_init(xsc) printf("%s: initialization failed: no " "memory for rx buffers\n", sc->sc_dv.dv_xname); nge_stop(sc); - (void)splx(s); + splx(s); return; } @@ -1815,7 +1815,7 @@ void nge_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - (void)splx(s); + splx(s); } /* @@ -1954,7 +1954,7 @@ int nge_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c index 6d12c9c22a3..1e7a8fd8057 100644 --- a/sys/dev/pci/if_sf.c +++ b/sys/dev/pci/if_sf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sf.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_sf.c,v 1.16 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -544,7 +544,7 @@ int sf_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } @@ -1067,7 +1067,7 @@ void sf_init(xsc) if (sf_init_rx_ring(sc) == ENOBUFS) { printf("sf%d: initialization failed: no " "memory for rx buffers\n", sc->sf_unit); - (void)splx(s); + splx(s); return; } diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 5b1cc530efd..04e35941fd7 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.20 2002/02/08 04:43:24 chris Exp $ */ +/* $OpenBSD: if_sis.c,v 1.21 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -1385,7 +1385,7 @@ void sis_init(xsc) printf("sis%d: initialization failed: no " "memory for rx buffers\n", sc->sis_unit); sis_stop(sc); - (void)splx(s); + splx(s); return; } @@ -1495,7 +1495,7 @@ void sis_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - (void)splx(s); + splx(s); timeout_set(&sc->sis_timeout, sis_tick, sc); timeout_add(&sc->sis_timeout, hz); @@ -1614,7 +1614,7 @@ int sis_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 85e2a052341..8f8b3748296 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.20 2002/01/11 01:31:21 nordin Exp $ */ +/* $OpenBSD: if_sk.c,v 1.21 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -749,7 +749,7 @@ sk_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } @@ -1889,7 +1889,7 @@ void sk_init(xsc) printf("%s: initialization failed: no " "memory for rx buffers\n", sc_if->sk_dev.dv_xname); sk_stop(sc_if); - (void)splx(s); + splx(s); return; } sk_init_tx_ring(sc_if); diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index 2ed50d1e052..cfc7b092c49 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti.c,v 1.33 2002/01/11 01:31:21 nordin Exp $ */ +/* $OpenBSD: if_ti.c,v 1.34 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2365,7 +2365,7 @@ int ti_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index b61df4f93d9..c72386ebc7a 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.24 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_tl.c,v 1.25 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1707,7 +1707,7 @@ void tl_init(xsc) /* Send the RX go command */ CMD_SET(sc, TL_CMD_GO|TL_CMD_NES|TL_CMD_RT); - (void)splx(s); + splx(s); /* Start the stats update counter */ timeout_set(&sc->tl_stats_tmo, tl_stats_update, sc); @@ -1849,7 +1849,7 @@ int tl_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 783cb68c673..fb46490d88f 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.60 2002/02/07 16:56:34 jason Exp $ */ +/* $OpenBSD: if_txp.c,v 1.61 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 2001 @@ -1243,7 +1243,7 @@ txp_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 8f086069ce5..8ddfcdd8c9c 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.21 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_vr.c,v 1.22 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1374,7 +1374,7 @@ vr_init(xsc) printf("%s: initialization failed: no memory for rx buffers\n", sc->sc_dev.dv_xname); vr_stop(sc); - (void)splx(s); + splx(s); return; } @@ -1427,7 +1427,7 @@ vr_init(xsc) if (!timeout_pending(&sc->sc_to)) timeout_add(&sc->sc_to, hz); - (void)splx(s); + splx(s); } /* @@ -1527,7 +1527,7 @@ vr_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index c6acce95936..1d39af67bbd 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_wb.c,v 1.16 2002/02/15 20:45:31 nordin Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1573,7 +1573,7 @@ void wb_init(xsc) printf("%s: initialization failed: no " "memory for rx buffers\n", sc->sc_dev.dv_xname); wb_stop(sc); - (void)splx(s); + splx(s); return; } @@ -1624,7 +1624,7 @@ void wb_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - (void)splx(s); + splx(s); timeout_set(&sc->wb_tick_tmo, wb_tick, sc); timeout_add(&sc->wb_tick_tmo, hz); @@ -1726,7 +1726,7 @@ int wb_ioctl(ifp, command, data) break; } - (void)splx(s); + splx(s); return(error); } diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index b8add2d5c57..fa505bba5ab 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.55 2002/01/14 03:11:55 provos Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.56 2002/02/15 20:45:32 nordin Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -421,7 +421,7 @@ tcp_usrreq(so, req, m, nam, control) case PRU_SENSE: ((struct stat *) m)->st_blksize = so->so_snd.sb_hiwat; - (void) splx(s); + splx(s); return (0); case PRU_RCVOOB: |