summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-10-15 01:37:50 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-10-15 01:37:50 +0000
commitedf1d7b0ecb2b92c188e848a47c63cf06e31fab0 (patch)
treea17bb19f05f35b3e6ef0c12c8b0676456f468384
parent0ca128acbb3b5ac217209e672ede6fa1a67a5d5a (diff)
more remove unneeded declarations that shadows existing vars; ok by many.
-rw-r--r--sys/dev/ic/ncr53c9x.c3
-rw-r--r--sys/dev/ic/rt2560.c3
-rw-r--r--sys/dev/ic/rt2661.c3
-rw-r--r--sys/dev/vnd.c4
4 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 8676dffeead..c21b1d8ad8e 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr53c9x.c,v 1.34 2007/08/06 08:28:09 tom Exp $ */
+/* $OpenBSD: ncr53c9x.c,v 1.35 2007/10/15 01:37:49 fgsch Exp $ */
/* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */
/*
@@ -2603,7 +2603,6 @@ msgin:
/* DELAY(1); */
}
if (sc->sc_features & NCR_F_DMASELECT) {
- size_t size;
/* setup DMA transfer for command */
size = ecb->clen;
sc->sc_cmdlen = size;
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 109805bae1d..3c82860ceba 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2560.c,v 1.33 2007/09/07 19:05:05 damien Exp $ */
+/* $OpenBSD: rt2560.c,v 1.34 2007/10/15 01:37:49 fgsch Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -1751,7 +1751,6 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0,
if (needrts || needcts) {
struct mbuf *mprot;
int protrate, ackrate;
- uint16_t dur;
protrate = 2; /* XXX */
ackrate = rt2560_ack_rate(ic, rate);
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index a9d7b101364..d7510886284 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2661.c,v 1.38 2007/09/07 19:05:05 damien Exp $ */
+/* $OpenBSD: rt2661.c,v 1.39 2007/10/15 01:37:49 fgsch Exp $ */
/*-
* Copyright (c) 2006
@@ -1597,7 +1597,6 @@ rt2661_tx_data(struct rt2661_softc *sc, struct mbuf *m0,
if (needrts || needcts) {
struct mbuf *mprot;
int protrate, ackrate;
- uint16_t dur;
protrate = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? 12 : 2;
ackrate = rt2661_ack_rate(ic, rate);
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index f79f85b719b..2e10f1bc730 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnd.c,v 1.83 2007/09/29 07:08:02 fkr Exp $ */
+/* $OpenBSD: vnd.c,v 1.84 2007/10/15 01:37:49 fgsch Exp $ */
/* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */
/*
@@ -517,7 +517,7 @@ vndstrategy(struct buf *bp)
for (resid = bp->b_resid; resid; resid -= sz) {
struct vnode *vp;
daddr64_t nbn;
- int off, s, nra;
+ int off, nra;
nra = 0;
vn_lock(vnd->sc_vp, LK_RETRY | LK_EXCLUSIVE, p);