summaryrefslogtreecommitdiff
path: root/sys/arch/vax
diff options
context:
space:
mode:
authorThomas Nordin <nordin@cvs.openbsd.org>2002-02-15 20:45:33 +0000
committerThomas Nordin <nordin@cvs.openbsd.org>2002-02-15 20:45:33 +0000
commit80edccbe704914e50445ba06dae9916169da06df (patch)
treee583a7e97e91aee6d5d1098a86c0a7e7083bd388 /sys/arch/vax
parent78c35609b8864cbec8390402ff594ea2b49873b2 (diff)
Don't cast nonexistent return value from splx to (void). ok art@
Diffstat (limited to 'sys/arch/vax')
-rw-r--r--sys/arch/vax/qbus/dhu.c16
-rw-r--r--sys/arch/vax/qbus/dz.c12
-rw-r--r--sys/arch/vax/uba/ts.c6
-rw-r--r--sys/arch/vax/vsa/dc.c6
4 files changed, 20 insertions, 20 deletions
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);
}