summaryrefslogtreecommitdiff
path: root/sys/dev/pci
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/dev/pci
parent78c35609b8864cbec8390402ff594ea2b49873b2 (diff)
Don't cast nonexistent return value from splx to (void). ok art@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_bge.c4
-rw-r--r--sys/dev/pci/if_lge.c8
-rw-r--r--sys/dev/pci/if_nge.c8
-rw-r--r--sys/dev/pci/if_sf.c6
-rw-r--r--sys/dev/pci/if_sis.c8
-rw-r--r--sys/dev/pci/if_sk.c6
-rw-r--r--sys/dev/pci/if_ti.c4
-rw-r--r--sys/dev/pci/if_tl.c6
-rw-r--r--sys/dev/pci/if_txp.c4
-rw-r--r--sys/dev/pci/if_vr.c8
-rw-r--r--sys/dev/pci/if_wb.c8
11 files changed, 35 insertions, 35 deletions
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);
}