Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev remove unused
details: https://anonhg.NetBSD.org/src/rev/e93b23ff3b13
branches: trunk
changeset: 328000:e93b23ff3b13
user: christos <christos%NetBSD.org@localhost>
date: Sun Mar 23 02:44:19 2014 +0000
description:
remove unused
diffstat:
sys/dev/ic/iavc.c | 5 ++---
sys/dev/isa/if_ntwoc_isa.c | 12 +++++-------
sys/dev/isa/isic_isa.c | 20 ++++----------------
sys/dev/isa/isv.c | 7 +++----
sys/dev/pci/ifpci2.c | 11 +++++------
sys/dev/pci/iwic_bchan.c | 18 ++++--------------
sys/dev/pci/iwic_dchan.c | 6 ++----
sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c | 7 +------
sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c | 7 +------
sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c | 7 +------
10 files changed, 28 insertions(+), 72 deletions(-)
diffs (truncated from 397 to 300 lines):
diff -r ca32639bc964 -r e93b23ff3b13 sys/dev/ic/iavc.c
--- a/sys/dev/ic/iavc.c Sun Mar 23 02:44:00 2014 +0000
+++ b/sys/dev/ic/iavc.c Sun Mar 23 02:44:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iavc.c,v 1.11 2014/03/23 02:44:00 christos Exp $ */
+/* $NetBSD: iavc.c,v 1.12 2014/03/23 02:44:19 christos Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.11 2014/03/23 02:44:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.12 2014/03/23 02:44:19 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -738,7 +738,6 @@
amcc_get_word(dmabuf, &Length);
} else {
Length = iavc_get_slice(sc, sc->sc_recvbuf);
- sc->sc_recvbuf;
}
/* XXX could show the message if trace enabled? XXX */
diff -r ca32639bc964 -r e93b23ff3b13 sys/dev/isa/if_ntwoc_isa.c
--- a/sys/dev/isa/if_ntwoc_isa.c Sun Mar 23 02:44:00 2014 +0000
+++ b/sys/dev/isa/if_ntwoc_isa.c Sun Mar 23 02:44:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_isa.c,v 1.24 2012/10/27 17:18:24 chs Exp $ */
+/* $NetBSD: if_ntwoc_isa.c,v 1.25 2014/03/23 02:45:02 christos Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
* Copyright (c) 1996 John Hay.
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ntwoc_isa.c,v 1.24 2012/10/27 17:18:24 chs Exp $
+ * $Id: if_ntwoc_isa.c,v 1.25 2014/03/23 02:45:02 christos Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.24 2012/10/27 17:18:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.25 2014/03/23 02:45:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,7 +191,7 @@
struct isa_attach_args *ia;
bus_space_tag_t iot, memt;
bus_space_handle_t ioh, memh, sca_ioh[16];
- int i, tmp, dbg, rv;
+ int i, tmp, rv;
int gotmem, gotsca[16];
u_int32_t ioport;
@@ -211,7 +211,6 @@
memset(gotsca, 0, sizeof(gotsca));
gotmem = rv = 0;
- dbg = 0;
/* disallow wildcarded I/O base */
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT) {
@@ -390,13 +389,12 @@
u_int8_t rdiv, tdiv, tmc;
u_int32_t flags, ioport;
u_int16_t tmp;
- int i, dbg, pgs, rv;
+ int i, pgs, rv;
ia = (struct isa_attach_args *)aux;
sc = device_private(self);
sc->sc_dev = self;
sca = &sc->sc_sca;
- dbg = 0;
printf(": N2 Serial Interface\n");
flags = device_cfdata(sc->sc_dev)->cf_flags;
diff -r ca32639bc964 -r e93b23ff3b13 sys/dev/isa/isic_isa.c
--- a/sys/dev/isa/isic_isa.c Sun Mar 23 02:44:00 2014 +0000
+++ b/sys/dev/isa/isic_isa.c Sun Mar 23 02:44:19 2014 +0000
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.36 2012/10/27 17:18:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.37 2014/03/23 02:46:55 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -780,23 +780,11 @@
struct isic_softc *sc = device_private(self);
struct isa_attach_args *ia = aux;
int flags = device_cfdata(self)->cf_flags;
- int ret = 0, iobase, iosize, maddr, msize;
+ int ret = 0, iobase, maddr;
struct isic_attach_args args;
- if (ia->ia_nio > 0) {
- iobase = ia->ia_io[0].ir_addr;
- iosize = ia->ia_io[0].ir_size;
- } else {
- iobase = ISA_UNKNOWN_PORT;
- iosize = 0;
- }
- if (ia->ia_niomem > 0) {
- maddr = ia->ia_iomem[0].ir_addr;
- msize = ia->ia_iomem[0].ir_size;
- } else {
- maddr = ISA_UNKNOWN_IOMEM;
- msize = 0;
- }
+ iobase = ia->ia_nio > 0 ? ia->ia_io[0].ir_addr : ISA_UNKNOWN_PORT;
+ maddr = ia->ia_niomem > 0 ? ia->ia_iomem[0].ir_addr : ISA_UNKNOWN_IOMEM;
/* Setup parameters */
sc->sc_dev = self;
diff -r ca32639bc964 -r e93b23ff3b13 sys/dev/isa/isv.c
--- a/sys/dev/isa/isv.c Sun Mar 23 02:44:00 2014 +0000
+++ b/sys/dev/isa/isv.c Sun Mar 23 02:44:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isv.c,v 1.5 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: isv.c,v 1.6 2014/03/23 02:50:51 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isv.c,v 1.5 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isv.c,v 1.6 2014/03/23 02:50:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -324,7 +324,6 @@
isv_capture(struct isv_softc *sc)
{
int speed;
- uint16_t discard;
int rc, state = ISV_S_CAPTURE0;
struct timeval diff, end, start, stop;
static const struct timeval wait = {.tv_sec = 0, .tv_usec = 200000};
@@ -372,7 +371,7 @@
/* read one dummy word to prime the state machine on the
* image capture board
*/
- discard = isv_read(ir, ISV_DATA);
+ isv_read(ir, ISV_DATA);
bus_space_read_multi_stream_2(ir->ir_bt, ir->ir_bh, ISV_DATA,
sc->sc_frame, ISV_WIDTH * ISV_LINES / 2);
diff -r ca32639bc964 -r e93b23ff3b13 sys/dev/pci/ifpci2.c
--- a/sys/dev/pci/ifpci2.c Sun Mar 23 02:44:00 2014 +0000
+++ b/sys/dev/pci/ifpci2.c Sun Mar 23 02:44:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci2.c,v 1.20 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: ifpci2.c,v 1.21 2014/03/23 02:45:30 christos Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@@ -36,14 +36,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci2.c,v 1.20 2012/10/27 17:18:34 chs Exp $
+ * $Id: ifpci2.c,v 1.21 2014/03/23 02:45:30 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.20 2012/10/27 17:18:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.21 2014/03/23 02:45:30 christos Exp $");
#include <sys/param.h>
@@ -249,7 +249,6 @@
struct pci_attach_args *pa = aux;
struct isic_softc *sc = &psc->sc_isic;
struct isdn_l3_driver *drv;
- u_int v;
sc->sc_dev = self;
@@ -297,7 +296,7 @@
/* init the card */
- v = bus_space_read_4(sc->sc_maps[0].t, sc->sc_maps[0].h, 0);
+ bus_space_read_4(sc->sc_maps[0].t, sc->sc_maps[0].h, 0);
bus_space_write_1(sc->sc_maps[0].t, sc->sc_maps[0].h, STAT0_OFFSET, 0);
DELAY(SEC_DELAY/20); /* 50 ms */
bus_space_write_1(sc->sc_maps[0].t, sc->sc_maps[0].h, STAT0_OFFSET, ASL_RESET);
@@ -318,7 +317,7 @@
/* init the ISAC */
isic_isacsx_init(sc);
- v = ISAC_READ(I_CIR0); /* Leo: reset generates status change */
+ ISAC_READ(I_CIR0); /* Leo: reset generates status change */
/* init the "HSCX" */
avma1pp2_bchannel_setup(sc, HSCX_CH_A, BPROT_NONE, 0);
diff -r ca32639bc964 -r e93b23ff3b13 sys/dev/pci/iwic_bchan.c
--- a/sys/dev/pci/iwic_bchan.c Sun Mar 23 02:44:00 2014 +0000
+++ b/sys/dev/pci/iwic_bchan.c Sun Mar 23 02:44:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_bchan.c,v 1.8 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: iwic_bchan.c,v 1.9 2014/03/23 02:53:12 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -38,7 +38,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.8 2012/10/27 17:18:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.9 2014/03/23 02:53:12 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -78,7 +78,6 @@
int irq_stat;
struct iwic_bchan *chan;
int cmd = 0;
- int activity = 0;
chan = &sc->sc_bchan[chan_no];
@@ -176,8 +175,6 @@
(*chan->l4_driver->bch_rx_data_ready)(chan->l4_driver_softc);
- activity = ACT_RX;
-
/* mark buffer ptr as unused */
chan->in_mbuf = NULL;
@@ -252,8 +249,7 @@
/* silence detection */
- if(!(isdn_bchan_silence(chan->in_mbuf->m_data, chan->in_mbuf->m_len)))
- activity = ACT_RX;
+ isdn_bchan_silence(chan->in_mbuf->m_data, chan->in_mbuf->m_len);
#if defined (__FreeBSD__) && __FreeBSD__ > 4
(void) IF_HANDOFF(&chan->rx_queue, chan->in_mbuf, NULL);
@@ -311,7 +307,6 @@
{
/* transmit fifo empty, new data can be written to fifo */
- int activity1 = -1;
int len;
int nextlen;
@@ -344,12 +339,7 @@
if(chan->bprot == BPROT_NONE)
{
- if(!(isdn_bchan_silence(chan->out_mbuf_cur->m_data, chan->out_mbuf_cur->m_len)))
- activity1 = ACT_TX;
- }
- else
- {
- activity1 = ACT_TX;
+ isdn_bchan_silence(chan->out_mbuf_cur->m_data, chan->out_mbuf_cur->m_len);
}
}
}
diff -r ca32639bc964 -r e93b23ff3b13 sys/dev/pci/iwic_dchan.c
--- a/sys/dev/pci/iwic_dchan.c Sun Mar 23 02:44:00 2014 +0000
+++ b/sys/dev/pci/iwic_dchan.c Sun Mar 23 02:44:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_dchan.c,v 1.7 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: iwic_dchan.c,v 1.8 2014/03/23 02:53:12 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.7 2012/10/27 17:18:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.8 2014/03/23 02:53:12 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -352,11 +352,9 @@
else
{
int hi, lo;
- int total_frame_len;
lo = IWIC_READ(sc, D_RBCL);
hi = IWIC_READ(sc, D_RBCH);
Home |
Main Index |
Thread Index |
Old Index