summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2009-05-10 12:59:13 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2009-05-10 12:59:13 +0000
commit3f2d2093d1264c9009eab80392de9c284a0804e4 (patch)
tree9f1dbe3477ceb9867a9cef48f1c0254bda1f4574 /sys
parentda12ece13ca7f672d0684397783a2e461122cfaa (diff)
Remove a dead variable and some unneeded returns.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc64/dev/vdsk.c5
-rw-r--r--sys/arch/sparc64/dev/vnet.c3
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index ebd25792267..3478c3fd93f 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vdsk.c,v 1.10 2009/02/20 17:55:28 kettenis Exp $ */
+/* $OpenBSD: vdsk.c,v 1.11 2009/05/10 12:59:12 kettenis Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis
*
@@ -365,7 +365,6 @@ free_rxqueue:
ldc_queue_free(sc->sc_dmatag, lc->lc_rxq);
free_txqueue:
ldc_queue_free(sc->sc_dmatag, lc->lc_txq);
- return;
}
int
@@ -401,7 +400,6 @@ vdsk_rx_intr(void *arg)
struct ldc_conn *lc = &sc->sc_lc;
uint64_t rx_head, rx_tail, rx_state;
struct ldc_pkt *lp;
- uint64_t *msg;
int err;
err = hv_ldc_rx_get_state(lc->lc_id, &rx_head, &rx_tail, &rx_state);
@@ -437,7 +435,6 @@ vdsk_rx_intr(void *arg)
if (rx_head == rx_tail)
return (0);
- msg = (uint64_t *)(lc->lc_rxq->lq_va + rx_head);
lp = (struct ldc_pkt *)(lc->lc_rxq->lq_va + rx_head);
switch (lp->type) {
case LDC_CTRL:
diff --git a/sys/arch/sparc64/dev/vnet.c b/sys/arch/sparc64/dev/vnet.c
index 5488274a974..dbcd60972ba 100644
--- a/sys/arch/sparc64/dev/vnet.c
+++ b/sys/arch/sparc64/dev/vnet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnet.c,v 1.13 2009/02/20 17:50:22 kettenis Exp $ */
+/* $OpenBSD: vnet.c,v 1.14 2009/05/10 12:59:12 kettenis Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis
*
@@ -308,7 +308,6 @@ vnet_attach(struct device *parent, struct device *self, void *aux)
free_txqueue:
ldc_queue_free(sc->sc_dmatag, lc->lc_txq);
- return;
}
int