The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static

and local variables, goto labels, and functions declared but not defined.

30 files changed, 91 insertions, 166 deletions

diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 2f9e4e1..593b305 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: adv_pci.c,v 1.1 1998/09/15 07:03:43 gibbs Exp $
  */
 
 #include <pci.h>
@@ -122,7 +122,6 @@ static void
 advpciattach(pcici_t config_id, int unit)
 {
 	u_int16_t	io_port;
-	u_int16_t	config_msw;
 	struct		adv_softc *adv;
 	u_int32_t	id;
 	u_int32_t	command;
@@ -252,9 +251,13 @@ advpciattach(pcici_t config_id, int unit)
 	adv->max_dma_addr = ADV_PCI_MAX_DMA_ADDR;
 
 #if CC_DISABLE_PCI_PARITY_INT
-	config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
-	config_msw &= 0xFFC0;
-	ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw); 
+	{
+		u_int16_t config_msw;
+
+		config_msw = ADV_INW(adv, ADV_CONFIG_MSW);
+		config_msw &= 0xFFC0;
+		ADV_OUTW(adv, ADV_CONFIG_MSW, config_msw); 
+	}
 #endif
  
 	if (id == PCI_DEVICE_ID_ADVANSYS_1200A
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 0a261fb..e612974 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advlib.c,v 1.8 1998/10/09 21:40:50 gibbs Exp $
+ *      $Id: advlib.c,v 1.9 1998/10/29 17:41:34 gibbs Exp $
  */
 /*
  * Ported from:
@@ -2009,8 +2009,6 @@ adv_reset_bus(struct adv_softc *adv)
 
 	count = 0;
 	while ((ccb = (union ccb *)LIST_FIRST(&adv->pending_ccbs)) != NULL) {
-		struct	adv_ccb_info *cinfo;
-		
 		if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)
 			ccb->ccb_h.status |= CAM_SCSI_BUS_RESET;
 		adv_done(adv, ccb, QD_ABORTED_BY_HOST, 0, 0, 0);
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 2109b91..eb941bf 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: adw_pci.c,v 1.1 1998/10/07 03:20:49 gibbs Exp $
  */
 
 #include <pci.h>
@@ -89,7 +89,9 @@ adwpciattach(pcici_t config_id, int unit)
 	u_int32_t	   id;
 	u_int32_t	   command;
 	vm_offset_t	   vaddr;
+#ifdef ADW_ALLOW_MEMIO
 	vm_offset_t	   paddr;
+#endif
 	u_int16_t	   io_port;
 	bus_space_tag_t    tag;
 	bus_space_handle_t bsh;
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 344658d..6c26c09 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.1 1998/09/15 07:25:33 gibbs Exp $
+ *	$Id: ahc_pci.c,v 1.2 1998/10/07 03:40:51 gibbs Exp $
  */
 
 #include <pci.h>
@@ -1172,7 +1172,6 @@ void
 ahc_pci_intr(struct ahc_softc *ahc)
 {
 	u_int8_t status1;
-	pcici_t config_id;
 
 	status1 = pci_cfgread(ahc->pci_config_id, PCIR_STATUS + 1, /*bytes*/1);
 
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 677303e..d4de62e 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.58 1998/11/07 14:30:48 nsouch Exp $ */
+/* $Id: brooktree848.c,v 1.59 1998/11/08 12:39:06 dfr Exp $ */
 /* BT848 Driver for Brooktree's Bt848 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -1940,7 +1940,6 @@ bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )
 static int
 video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
 {
-	int			tmp_int;
 	bt848_ptr_t		bt848;
 	volatile u_char		c_temp;
 	unsigned int		temp;
@@ -1951,7 +1950,6 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr )
 	struct meteor_video	*video;
 	struct bktr_capture_area *cap_area;
 	vm_offset_t		buf;
-	struct format_params	*fp;
 	int                     i;
 	char                    char_temp;
 
@@ -4495,7 +4493,7 @@ static void
 probeCard( bktr_ptr_t bktr, int verbose )
 {
 	int	card, i,j, card_found;
-	int	status, *test;
+	int	status;
 	bt848_ptr_t	bt848;
 	u_char probe_signature[128], *probe_temp;
         int   any_i2c_devices;
@@ -4737,7 +4735,6 @@ checkMSP:
 
 checkEnd:
 
-checkPLL:
 #if defined( BKTR_USE_PLL )
 	bktr->xtal_pll_mode = BT848_USE_PLL;
 	goto checkPLLEnd;
@@ -4748,7 +4745,9 @@ checkPLL:
 	if ((card == CARD_HAUPPAUGE) &&
 	   (bktr->id==BROOKTREE_878_ID || bktr->id==BROOKTREE_879_ID) )
 		bktr->xtal_pll_mode = BT848_USE_PLL;
+#if defined( BKTR_USE_PLL )
 checkPLLEnd:
+#endif
 
 
 	bktr->card.tuner_pllAddr = tuner_i2c_address;
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 3b63f4d..1eaf3de 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_cs.c,v 1.5 1998/10/04 02:11:15 msmith Exp $
+ * $Id: if_cs.c,v 1.6 1998/10/22 05:58:38 bde Exp $
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -190,7 +190,6 @@ get_eeprom_cksum(int off, int len, int *buffer)
 static int
 wait_eeprom_ready(struct cs_softc *sc)
 {
-	int timeout=1000;
 	DELAY ( 30000 );	/* XXX should we do some checks here ? */
 	return 0;
 }
@@ -233,7 +232,6 @@ cs_duplex_auto(struct cs_softc *sc)
 static int
 enable_tp(struct cs_softc *sc)
 {
-	int i;
 	int unit = sc->arpcom.ac_if.if_unit;
 
 	cs_writereg(sc->nic_addr, PP_LineCTL, sc->line_ctl & ~AUI_ONLY);
@@ -254,7 +252,6 @@ enable_tp(struct cs_softc *sc)
 static int
 send_test_pkt(struct cs_softc *sc)
 {
-	int unit = sc->arpcom.ac_if.if_unit;
 	char test_packet[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
 				0, 46,  /* A 46 in network order */
 				0, 0,   /* DSAP=0 & SSAP=0 fields */
@@ -343,7 +340,7 @@ cs_cs89x0_probe(struct cs_softc *sc, u_int *dev_irq,
 			int *dev_drq, int iobase, int unit, int flags)
 {
 	unsigned rev_type = 0;
-	int i, irq=0, result;
+	int i, irq=0;
 	int eeprom_buff[CHKSUM_LEN];
 	int chip_type, pp_isaint, pp_isadma;
 	char chip_revision;
@@ -646,7 +643,7 @@ cs_init(void *xsc)
 {
 	struct cs_softc *sc=(struct cs_softc *)xsc;
 	struct ifnet *ifp = &sc->arpcom.ac_if;
-	int i, s, result, rx_cfg;
+	int i, s, rx_cfg;
 
 	/* address not known */
 	if (TAILQ_EMPTY(&ifp->if_addrhead)) /* unlikely? XXX */
@@ -816,7 +813,7 @@ static void
 csintr_sc(struct cs_softc *sc, int unit)
 {
 	struct ifnet *ifp = &(sc->arpcom.ac_if);
-	int status, s;
+	int status;
 
 #ifdef CS_DEBUG
 	printf(CS_NAME"%1d: Interrupt.\n", unit);
@@ -1306,7 +1303,6 @@ csintr_pnp_add(struct cs_softc *sc, int unit)
 static void
 csintr_pnp(int unit)
 {
-    struct cs_softc *sc;
     struct csintr_list *intr;
 
     for (intr=csintr_head; intr; intr=intr->next) {
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index aac2725..7aeb258 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.39 1998/08/16 01:21:49 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.40 1998/08/23 08:26:39 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -407,10 +407,8 @@ dgbprobe(dev)
 	struct isa_device	*dev;
 {
 	struct dgb_softc *sc= &dgb_softc[dev->id_unit];
-	int i, v, t;
+	int i, v;
 	u_long win_size;  /* size of vizible memory window */
-	u_char *mem;
-	int addr;
 	int unit=dev->id_unit;
 
 	sc->unit=dev->id_unit;
@@ -525,7 +523,6 @@ dgbattach(dev)
 	int addr;
 	struct dgb_p *port;
 	volatile struct board_chan *bc;
-	struct global_data *gd;
 	int shrinkmem;
 	int nfails;
 	ushort *pstat;
@@ -1283,7 +1280,6 @@ dgbpoll(unit_c)
 	int rhead, rtail;
 	int whead, wtail;
 	int size;
-	int c=0;
 	u_char *ptr;
 	int ocount;
 	int ibuf_full,obuf_full;
@@ -1512,7 +1508,6 @@ dgbpoll(unit_c)
 				        setwin(sc,0);
 				        }
 			        }
-			end_of_buffer: ;
 			}
 			bc->idata=1;   /* require event on incoming data */ 
 
@@ -1957,7 +1952,6 @@ dgbparam(tp, t)
 	struct termios	*t;
 {
 	int dev=tp->t_dev;
-	int mynor=minor(dev);
 	int unit=MINOR_TO_UNIT(dev);
 	int pnum=MINOR_TO_PORT(dev);
 	struct dgb_softc *sc=&dgb_softc[unit];
@@ -1968,7 +1962,7 @@ dgbparam(tp, t)
 	int mval;
 	int iflag;
 	int hflow;
-	int s,cs;
+	int cs;
 
 	BoardMemWinState ws=bmws_get();
 
@@ -2170,7 +2164,6 @@ dgbstop(tp, rw)
 	struct dgb_p *port;
 	struct dgb_softc *sc;
 	volatile struct board_chan *bc;
-	int head;
 	int s;
 
 	BoardMemWinState ws=bmws_get();
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index eca931a..8b0ca1f 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.4 1998/08/16 01:21:49 bde Exp $
+ *	$Id: dgm.c,v 1.5 1998/08/23 08:26:40 bde Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -381,9 +381,7 @@ dgmprobe(dev)
 	struct isa_device	*dev;
 {
 	struct dgm_softc *sc= &dgm_softc[dev->id_unit];
-	int i, v, t;
-	u_char *mem;
-	int addr;
+	int i, v;
 	int unit=dev->id_unit;
 
 	sc->unit=dev->id_unit;
@@ -449,14 +447,9 @@ dgmattach(dev)
 	int addr;
 	struct dgm_p *port;
 	volatile struct board_chan *bc;
-	struct global_data *gd;
 	int shrinkmem;
-	int nfails;
-	ushort *pstat;
 	int lowwater;
 	static int nports=0;
-	char ch;
-	int stuff;
 
 	if(sc->status!=ENABLED) {
 		DPRINT2(DB_EXCEPT,"dbg%d: try to attach a disabled card\n",unit);
@@ -1087,7 +1080,6 @@ dgmpoll(unit_c)
 	int rhead, rtail;
 	int whead, wtail;
 	int size;
-	int c=0;
 	u_char *ptr;
 	int ocount;
 	int ibuf_full,obuf_full;
@@ -1316,7 +1308,6 @@ dgmpoll(unit_c)
 				        setwin(sc,0);
 				        }
 			        }
-			end_of_buffer: ;
 			}
 			bc->idata=1;   /* require event on incoming data */ 
 
@@ -1761,7 +1752,6 @@ dgmparam(tp, t)
 	struct termios	*t;
 {
 	int dev=tp->t_dev;
-	int mynor=minor(dev);
 	int unit=MINOR_TO_UNIT(dev);
 	int pnum=MINOR_TO_PORT(dev);
 	struct dgm_softc *sc=&dgm_softc[unit];
@@ -1772,7 +1762,7 @@ dgmparam(tp, t)
 	int mval;
 	int iflag;
 	int hflow;
-	int s,cs;
+	int cs;
 
 	BoardMemWinState ws=bmws_get();
 
@@ -1975,7 +1965,6 @@ dgmstop(tp, rw)
 	struct dgm_p *port;
 	struct dgm_softc *sc;
 	volatile struct board_chan *bc;
-	int head;
 	int s;
 
 	BoardMemWinState ws=bmws_get();
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index 7af9a2a..b704fca 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.8 1998/09/15 08:33:38 gibbs Exp $"
+#ident "$Id: dpt_pci.c,v 1.9 1998/10/07 03:40:51 gibbs Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
@@ -112,14 +112,13 @@ dpt_pci_attach(pcici_t config_id, int unit)
 {
 	dpt_softc_t	   *dpt;
 	vm_offset_t	    vaddr;
+#ifdef DPT_ALLOW_MEMIO
 	vm_offset_t	    paddr;
+#endif
 	u_int16_t	    io_base;
 	bus_space_tag_t     tag;
 	bus_space_handle_t  bsh;
 	u_int32_t	    command;
-	u_int32_t	    data;
-	int		    result;
-	int		    ndx;
 	int		    s;
 
 	vaddr = NULL;
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 3bb7737..37df7b1 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.124 1998/10/22 05:58:38 bde Exp $
+ *	$Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
  *
  */
 
@@ -1299,7 +1299,6 @@ fdintr(fdcu_t fdcu)
 static int
 fdstate(fdcu_t fdcu, fdc_p fdc)
 {
-	struct subdev *sd;
 	int read, format, head, i, sec = 0, sectrac, st0, cyl, st3;
 	unsigned blknum = 0, b_cylinder = 0;
 	fdu_t fdu = fdc->fdu;
@@ -1743,10 +1742,8 @@ static int
 retrier(fdcu)
 	fdcu_t fdcu;
 {
-	struct subdev *sd;
 	fdc_p fdc = fdc_data + fdcu;
 	register struct buf *bp;
-	int fdu;
 
 	bp = bufq_first(&fdc->head);
 
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index ae8613a..929d0f7 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.42 1998/06/21 16:51:06 bde Exp $
+ * $Id: if_fe.c,v 1.43 1998/10/22 05:58:39 bde Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -395,7 +395,6 @@ feinit(struct pccard_devinfo *devi)
 static void
 feunload(struct pccard_devinfo *devi)
 {
-	struct fe_softc *sc = &fe_softc[devi->isahd.id_unit];
 	printf("fe%d: unload\n", devi->isahd.id_unit);
 	fe_stop(devi->isahd.id_unit);
 }
@@ -1209,7 +1208,7 @@ fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
 static int
 fe_probe_mbh ( DEVICE * dev, struct fe_softc * sc )
 {
-	int i,type;
+	int i;
 
 	static struct fe_simple_probe_struct probe_table [] = {
 		{ FE_DLCR0, 0x09, 0x00 },
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 540b07f..7af9db7 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ic.c,v 1.1.1.1 1998/09/03 20:51:50 nsouch Exp $
+ *	$Id: if_ic.c,v 1.2 1998/10/31 11:31:07 nsouch Exp $
  */
 
 /*
@@ -290,7 +290,6 @@ icintr (device_t dev, int event, char *ptr)
 	int unit = device_get_unit(dev);
 	int s, len;
 	struct mbuf *top;
-	int i;
 	
 	s = splhigh();
 
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index ccebb5b..e2d59fd 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.c,v 1.3 1998/09/09 18:57:24 nsouch Exp $
+ *	$Id: iic.c,v 1.4 1998/10/31 11:31:07 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -117,8 +117,6 @@ iic_probe(device_t dev)
 static int
 iic_attach(device_t dev)
 {
-	struct iic_softc *sc = (struct iic_softc *)device_get_softc(dev);
-
 	return (0);
 }
 
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 35fa610..fd982ce 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbus.c,v 1.4 1998/11/08 18:42:34 nsouch Exp $
+ *	$Id: iicbus.c,v 1.5 1998/11/22 22:01:42 nsouch Exp $
  *
  */
 
@@ -125,8 +125,6 @@ iicbus_probe(device_t dev)
 	return (0);
 }
 
-static int iicdev_found[LAST_SLAVE_ADDR+1];
-
 static int 
 iic_probe_device(device_t dev, u_char addr)
 {
@@ -155,11 +153,9 @@ iic_probe_device(device_t dev, u_char addr)
 static int
 iicbus_attach(device_t dev)
 {
-	struct iicbus_softc *sc = device_get_softc(dev);
 	struct iicbus_device *iicdev;
 	device_t child;
-	int addr, count;
-	char byte;
+	int addr;
 
 	iicbus_reset(dev, IIC_FASTEST, 0, NULL);
 
@@ -265,8 +261,6 @@ iicbus_read_ivar(device_t bus, device_t dev, int index, u_long* result)
 static int
 iicbus_write_ivar(device_t bus, device_t dev, int index, u_long val)
 {
-	struct iicbus_device* iicdev = DEVTOIICBUS(dev);
-
 	switch (index) {
 	default:
 		return (ENOENT);
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 7363077..b3e11d8 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.4 1998/10/31 14:23:09 peter Exp $
+ *	$Id: pcf.c,v 1.5 1998/11/04 22:09:17 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -149,7 +149,6 @@ pcfprobe_isa(struct isa_device *dvp)
 {
 	device_t pcfdev;
 	struct pcf_isa_softc *pcf;
-	int error;
 
 	if (npcf >= MAXPCF)
 		return (0);
@@ -172,7 +171,6 @@ pcfprobe_isa(struct isa_device *dvp)
 	if (!pcfdev)
 		goto error;
 
-end_probe:
 	return (1);
 
 error:
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 39c43f0..7c77779 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lpbb.c,v 1.1 1998/10/31 11:35:21 nsouch Exp $
+ *	$Id: lpbb.c,v 1.2 1998/11/09 22:22:01 nsouch Exp $
  *
  */
 
@@ -133,7 +133,6 @@ lpbb_probe(device_t dev)
 static int
 lpbb_attach(device_t dev)
 {
-	struct lpbb_softc *sc = (struct lpbb_softc *)device_get_softc(dev);
 	device_t bitbang, iicbus;
 	
 	/* add generic bit-banging code */
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 86ebe02..8f657cd 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.c,v 1.7 1998/09/13 18:26:26 nsouch Exp $
+ *	$Id: ppbconf.c,v 1.8 1998/09/20 14:41:54 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -257,7 +257,6 @@ end_detect:
 int
 ppb_attachdevs(struct ppb_data *ppb)
 {
-	int error;
 	struct ppb_device *dev;
 	struct ppb_driver **p_drvpp, *p_drvp;
 
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index f742e4b..3103ee3 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.6 1998/01/02 09:30:39 msmith Exp $
+ *	$Id: ppi.c,v 1.7 1998/06/07 17:09:49 dfr Exp $
  *
  */
 #include "ppi.h"
@@ -116,8 +116,6 @@ ppiprobe(struct ppb_data *ppb)
 static int
 ppiattach(struct ppb_device *dev)
 {
-	struct ppi_data *ppi = ppidata[dev->id_unit];
-
 	/*
 	 * Report ourselves
 	 */
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 9d1f20d..95b255c 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: pps.c,v 1.10 1998/08/03 19:14:31 msmith Exp $
+ * $Id: pps.c,v 1.11 1998/08/24 16:31:27 phk Exp $
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
@@ -153,7 +153,6 @@ ppsintr(int unit)
 {
 	struct pps_data *sc = softc[unit];
 	struct timespec tc;
-	struct timeval tv;
 
 	nanotime(&tc);
 	if (!(ppb_rstr(&sc->pps_dev) & nACK))
@@ -171,6 +170,8 @@ ppsintr(int unit)
 	sc->ppsinfo.assert_sequence++;
 #ifdef PPS_SYNC
 	if (sc->ppsparam.mode & PPS_HARDPPSONASSERT) {
+		struct timeval tv;
+
 		tv.tv_sec = tc.tv_sec;
 		tv.tv_usec = tc.tv_nsec / 1000;
 		hardpps(&tv, tv.tv_usec);
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 0585a49..e8d0b8d 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpo.c,v 1.4 1997/09/01 00:51:52 bde Exp $
+ *	$Id: vpo.c,v 1.8 1998/09/20 14:41:54 nsouch Exp $
  *
  */
 
@@ -157,7 +157,6 @@ vpoprobe(struct ppb_data *ppb)
 static int
 vpoattach(struct ppb_device *dev)
 {
-	struct scsibus_data *scbus;
 	struct vpo_data *vpo = vpodata[dev->id_unit];
 	struct cam_devq *devq;
 
@@ -211,9 +210,11 @@ vpoattach(struct ppb_device *dev)
 static void
 vpo_intr(struct vpo_data *vpo, struct ccb_scsiio *csio)
 {
-
-	int i, errno;	/* error in errno.h */
+	int errno;	/* error in errno.h */
 	int s;
+#ifdef VP0_DEBUG
+	int i;
+#endif
 
 	s = splcam();
 
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index a416efe..e42eca7 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpoio.c,v 1.2 1998/09/13 18:26:26 nsouch Exp $
+ *	$Id: vpoio.c,v 1.3 1998/09/20 14:41:54 nsouch Exp $
  *
  */
 
@@ -449,10 +449,7 @@ vpoio_outstr(struct vpoio_data *vpo, char *buffer, int size)
 static int
 vpoio_instr(struct vpoio_data *vpo, char *buffer, int size)
 {
-
-	register int k;
 	int error = 0;
-	int r, mode, epp;
 
 	ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, buffer, size, MS_UNKNOWN, &error);
 
@@ -488,7 +485,6 @@ vpoio_instr(struct vpoio_data *vpo, char *buffer, int size)
 static char
 vpoio_select(struct vpoio_data *vpo, int initiator, int target)
 {
-	register int	k;
 	int ret;
 
 	struct ppb_microseq select_microseq[] = {
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index a22dfb0..f24654b 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.10 1998/10/22 05:58:40 bde Exp $
+ *	$Id: ppc.c,v 1.11 1998/10/31 11:37:09 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -240,7 +240,7 @@ static int
 ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_mode)	/* XXX mode never forced */
 {
     static int	index = 0;
-    int		base, idport, irq;
+    int		idport, irq;
     int		ptr, pcr, val, i;
     
     while ((idport = pc873xx_basetab[index++])) {
@@ -701,7 +701,7 @@ static int w83877f_hefs[] = { WINB_HEFERE, WINB_HEFRAS, WINB_HEFERE | WINB_HEFRA
 static int
 ppc_w83877f_detect(struct ppc_data *ppc, int chipset_mode)
 {
-	int i, j, efer, base;
+	int i, j, efer;
 	unsigned char r, hefere, hefras;
 
 	for (i = 0; i < 4; i ++) {
@@ -876,8 +876,6 @@ found:
 static int
 ppc_generic_detect(struct ppc_data *ppc, int chipset_mode)
 {
-	char save_control;
-
 	/* default to generic */
 	ppc->ppc_link.adapter = &ppc_generic_adapter;
 
@@ -1308,7 +1306,6 @@ ppcprobe(struct isa_device *dvp)
 {
 	static short next_bios_ppc = 0;
 	struct ppc_data *ppc;
-	int error;
 
 	/*
 	 * If port not specified, use bios list.
@@ -1370,8 +1367,6 @@ ppcprobe(struct isa_device *dvp)
 	if (ppc_detect(ppc, dvp->id_flags & 0xf))
 		goto error;
 
-end_probe:
-
 	return (1);
 
 error:
@@ -1383,7 +1378,6 @@ ppcattach(struct isa_device *isdp)
 {
 	struct ppc_data *ppc = ppcdata[isdp->id_unit];
 	struct ppb_data *ppbus;
-	char * mode;
 
 	printf("ppc%d: %s chipset (%s) in %s mode%s\n", ppc->ppc_unit,
 		ppc_types[ppc->ppc_type], ppc_avms[ppc->ppc_avm],
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 847660e..7dd8c6d 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -809,10 +809,11 @@ static	struct cdevsw	rp_cdevsw = {
 
 static int rp_controller_port = 0;
 static int rp_num_ports_open = 0;
-static int rp_timeout;
 static int	ndevs = 0;
 static int	minor_to_unit[128];
+#if 0
 static	struct	tty	rp_tty[128];
+#endif
 
 static int rp_num_ports[4];	/* Number of ports on each controller */
 
@@ -858,7 +859,7 @@ static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp,
 {
 	int	spl;
 	unsigned	int	CharNStat;
-	int	ToRecv, wRecv, ch;
+	int	ToRecv, ch;
 
 	ToRecv = sGetRxCnt(cp);
 	if(ToRecv == 0)
@@ -924,7 +925,7 @@ static _INLINE_ void rp_handle_port(struct rp_port *rp)
 	CHANNEL_t	*cp;
 	struct	tty	*tp;
 	unsigned	int	IntMask, ChanStatus;
-	int	oldcts, ToRecv;
+     /*	int	oldcts; */
 
 	if(!rp)
 		return;
@@ -1023,9 +1024,8 @@ int
 rpprobe(dev)
 struct isa_device *dev;
 {
-	struct	isa_device	*idev;
 	int controller, unit;
-	int i, aiop, num_aiops;
+	int aiop, num_aiops;
 	unsigned int aiopio[MAX_AIOPS_PER_BOARD];
 	CONTROLLER_t *ctlp;
 
@@ -1070,7 +1070,7 @@ static void
 rp_pciattach(pcici_t tag, int unit)
 {
 	dev_t	rp_dev;
-	int	success, rpmajor, oldspl;
+	int	success, oldspl;
 	u_short iobase;
 	int	num_ports, num_chan, num_aiops;
 	int	aiop, chan, port;
@@ -1079,7 +1079,6 @@ rp_pciattach(pcici_t tag, int unit)
 	struct	rp_port *rp;
 	struct	tty	*tty;
 	CONTROLLER_t	*ctlp;
-	char	status;
 
 	success = pci_map_port(tag, 0x10, &iobase);
 	if(!success)
@@ -1183,7 +1182,7 @@ struct	isa_device	*dev;
 {
 	struct	isa_device	*idev;
 	dev_t	rp_dev;
-	int	iobase, unit, rpmajor, oldspl;
+	int	iobase, unit, /*rpmajor,*/ oldspl;
 	int	num_ports, num_chan, num_aiops;
 	int	aiop, chan, port;
 	int	ChanStatus, line, i, count;
@@ -1191,7 +1190,6 @@ struct	isa_device	*dev;
 	struct	rp_port *rp;
 	struct	tty	*tty;
 	CONTROLLER_t	*ctlp;
-	char	status;
 
 	iobase = dev->id_iobase;
 	unit = dev->id_unit;
@@ -1303,7 +1301,7 @@ rpopen(dev, flag, mode, p)
 	struct	proc	*p;
 {
 	struct	rp_port *rp;
-	int	unit, i, port, mynor, umynor, flags;  /* SG */
+	int	unit, port, mynor, umynor, flags;  /* SG */
 	struct	tty	*tp;
 	int	oldspl, error;
 	unsigned int	IntMask, ChanStatus;
@@ -1450,7 +1448,7 @@ rpclose(dev, flag, mode, p)
 	int	flag, mode;
 	struct	proc	*p;
 {
-	int	oldspl, unit, mynor, umynor, port, status, i; /* SG */
+	int	oldspl, unit, mynor, umynor, port; /* SG */
 	struct	rp_port *rp;
 	struct	tty	*tp;
 	CHANNEL_t	*cp;
@@ -1483,7 +1481,7 @@ rpclose(dev, flag, mode, p)
 static void
 rphardclose(struct rp_port *rp)
 {
-	int	status, oldspl, mynor;
+	int	mynor;
 	struct	tty	*tp;
 	CHANNEL_t	*cp;
 
@@ -1525,7 +1523,7 @@ rpread(dev, uio, flag)
 {
 	struct	rp_port *rp;
 	struct	tty	*tp;
-	int	unit, i, mynor, umynor, port, error = 0; /* SG */
+	int	unit, mynor, umynor, port, error = 0; /* SG */
 
    umynor = (((minor(dev) >> 16) -1) * 32);    /* SG */
 	port  = (minor(dev) & 0x1f);                /* SG */
@@ -1549,7 +1547,7 @@ rpwrite(dev, uio, flag)
 {
 	struct	rp_port *rp;
 	struct	tty	*tp;
-	int	unit, i, mynor, port, umynor, error = 0; /* SG */
+	int	unit, mynor, port, umynor, error = 0; /* SG */
 
    umynor = (((minor(dev) >> 16) -1) * 32);    /* SG */
 	port  = (minor(dev) & 0x1f);                /* SG */
@@ -1594,9 +1592,8 @@ rpioctl(dev, cmd, data, flag, p)
 	CHANNEL_t	*cp;
 	struct tty	*tp;
 	int	unit, mynor, port, umynor;            /* SG */
-	int	oldspl, cflag, iflag, oflag, lflag;
-	int	i, error = 0;
-	char	status;
+	int	oldspl;
+	int	error = 0;
 	int	arg, flags, result, ChanStatus;
 	int	oldcmd;
 	struct	termios term, *t;
@@ -1804,9 +1801,9 @@ rpparam(tp, t)
 {
 	struct rp_port	*rp;
 	CHANNEL_t	*cp;
-	int	unit, i, mynor, port, umynor;               /* SG */
+	int	unit, mynor, port, umynor;               /* SG */
 	int	oldspl, cflag, iflag, oflag, lflag;
-	int	ospeed, flags;
+	int	ospeed;
 
 
    umynor = (((minor(tp->t_dev) >> 16) -1) * 32);    /* SG */
@@ -1942,10 +1939,10 @@ rpstart(tp)
 	struct rp_port	*rp;
 	CHANNEL_t	*cp;
 	struct	clist	*qp;
-	int	unit, i, mynor, port, umynor;               /* SG */
-	char	status, ch, flags;
+	int	unit, mynor, port, umynor;               /* SG */
+	char	ch, flags;
 	int	spl, xmit_fifo_room;
-	int	count, ToRecv;
+	int	count;
 
 
    umynor = (((minor(tp->t_dev) >> 16) -1) * 32);    /* SG */
@@ -2002,11 +1999,8 @@ rpstop(tp, flag)
 {
 	struct rp_port	*rp;
 	CHANNEL_t	*cp;
-	struct	clist	*qp;
 	int	unit, mynor, port, umynor;                  /* SG */
-	char	status, ch;
-	int	spl, xmit_fifo_room;
-	int	i, count;
+	int	spl;
 
    umynor = (((minor(tp->t_dev) >> 16) -1) * 32);    /* SG */
 	port  = (minor(tp->t_dev) & 0x1f);                /* SG */
@@ -2044,7 +2038,7 @@ struct tty *
 rpdevtotty(dev_t dev)
 {
 	struct	rp_port *rp;
-	int	unit, i, port, mynor, umynor;         /* SG */
+	int	unit, port, mynor, umynor;         /* SG */
 
    umynor = (((minor(dev) >> 16) -1) * 32);    /* SG */
 	port  = (minor(dev) & 0x1f);                /* SG */
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 94719fb..72c4780 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.c,v 1.2 1998/09/04 17:53:42 nsouch Exp $
+ *	$Id: smb.c,v 1.3 1998/09/09 18:57:38 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -119,8 +119,6 @@ smb_probe(device_t dev)
 static int
 smb_attach(device_t dev)
 {
-	struct smb_softc *sc = (struct smb_softc *)device_get_softc(dev);
-
 	return (0);
 }
 
@@ -161,7 +159,7 @@ smbwrite(dev_t dev, struct uio * uio, int ioflag)
 {
 	device_t smbdev = IIC_DEVICE(minor(dev));
 	struct smb_softc *sc = IIC_SOFTC(minor(dev));
-	int error, count;
+	int count;
 
 	if (!sc || !smbdev)
 		return (EINVAL);
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index f662d0b..03c8e2f3 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbus.c,v 1.2 1998/10/31 11:39:54 nsouch Exp $
+ *	$Id: smbus.c,v 1.3 1998/11/22 22:01:42 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -107,10 +107,10 @@ smbus_probe(device_t dev)
 static int
 smbus_attach(device_t dev)
 {
-	struct smbus_device *smbdev;
 	device_t child;
-	char byte;
-	u_short addr;
+#if 0
+	struct smbus_device *smbdev;
+#endif
 
 	bus_generic_attach(dev);
 
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index aabfe19..39ac7ea 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvesactl.c,v 1.5 1998/09/26 03:38:40 yokota Exp $
+ * $Id: scvesactl.c,v 1.6 1998/10/01 11:39:17 yokota Exp $
  */
 
 #include "sc.h"
@@ -52,11 +52,8 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	scr_stat *scp;
 	struct tty *tp;
-	video_info_t info;
 	video_adapter_t *adp;
 	int mode;
-	int error;
-	int s;
 
 	tp = scdevtotty(dev);
 	if (!tp)
@@ -84,7 +81,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		if (!(adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		mode = (cmd & 0xff) + M_VESA_BASE;
-vesa_text:
 		return sc_set_text_mode(scp, tp, mode, 0, 0, 0);
 
 	/* graphics modes */
@@ -112,7 +108,6 @@ vesa_text:
 		if (!(adp->va_flags & V_ADP_MODECHANGE))
 			return ENODEV;
 		mode = (cmd & 0xff) + M_VESA_BASE;
-vesa_graphics:
 		return sc_set_graphics_mode(scp, tp, mode);
 	}
 
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index a9c6fc9..f26d3b3 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.286 1998/11/03 02:37:46 yokota Exp $
+ *	$Id: syscons.c,v 1.287 1998/11/08 12:39:02 dfr Exp $
  */
 
 #include "sc.h"
@@ -640,7 +640,9 @@ static int
 scattach(struct isa_device *dev)
 {
     scr_stat *scp;
+#if defined(VESA) && defined(VM86)
     video_info_t info;
+#endif
     dev_t cdev = makedev(CDEV_MAJOR, 0);
 #ifdef DEVFS
     int vc;
@@ -924,7 +926,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
     int i;
     struct tty *tp;
     scr_stat *scp;
-    video_adapter_t *adp;
     int s;
 
     tp = scdevtotty(dev);
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index d1a63ce..a462796 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.16 1998/11/01 07:44:33 semenu Exp $ */
+/*	$Id: if_tx.c,v 1.17 1998/11/09 09:34:00 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -407,8 +407,7 @@ epic_freebsd_attach(
 #else
 	caddr_t	pmembase;
 #endif
-	int i,k,s,tmp;
-	u_int32_t pool;
+	int i,s,tmp;
 
 	printf("tx%d",unit);
 
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index a96d14c..e0b377f 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $
+ *	$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $
  */
 
 /*
@@ -96,8 +96,8 @@
 #include <pci/if_vrreg.h>
 
 #ifndef lint
-static char rcsid[] =
-	"$Id: if_vr.c,v 1.1 1998/12/04 18:01:21 wpaul Exp $";
+static const char rcsid[] =
+	"$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $";
 #endif
 
 /*
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 73fc3ac..6cf40b1 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.16 1998/10/22 05:58:39 bde Exp $ */
+/* $Id: if_wl.c,v 1.17 1998/11/15 19:30:48 eivind Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -311,7 +311,6 @@ static void	wlmmcstat(int unit);
 static u_short	wlbldru(int unit);
 static u_short	wlmmcread(u_int base, u_short reg);
 static void	wlinitmmc(int unit);
-static void	wlsetirq(int base, int irq);
 static int	wlhwrst(int unit);
 static void	wlrustrt(int unit);
 static void	wlbldcu(int unit);
@@ -365,7 +364,6 @@ wlprobe(struct isa_device *id)
 {
     struct wl_softc	*sc = &wl_softc[id->id_unit];	
     register short	base = id->id_iobase;
-    int			unit = id->id_unit;
     char		*str = "wl%d: board out of range [0..%d]\n";
     u_char		inbuf[100];
     unsigned long	oldpri;
@@ -723,8 +721,6 @@ static int
 wlhwrst(int unit)
 {
     register struct wl_softc	*sc = WLSOFTC(unit);
-    int 	i;
-    short	base = sc->base;
 
 #ifdef WLDEBUG
     if (sc->wl_if.if_flags & IFF_DEBUG)
@@ -1171,7 +1167,6 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
     short		base = sc->base;
     short		mode = 0;
     int			opri, error = 0;
-    u_short		tmp;
     struct proc		*p = curproc;	/* XXX */
     int			irq, irqval, i, isroot, size;
     caddr_t		up;
@@ -1479,11 +1474,8 @@ wlintr(unit)
 int unit;
 {
     register struct wl_softc *sc = &wl_softc[unit];
-    scb_t		scb;
-    ac_t		cb;
     short		base = sc->base;
-    int			next, x, opri;
-    int			i, ac_status;
+    int			ac_status;
     u_short		int_type, int_type1;
 
 #ifdef WLDEBUG
@@ -2328,7 +2320,6 @@ static void
 wlsftwsleaze(u_short *countp, u_char **mb_pp, struct mbuf **tm_pp, int unit)
 {
     struct mbuf	*tm_p = *tm_pp;
-    u_char		*mb_p = *mb_pp;
     u_short		count = 0;
     u_char		*cp = (u_char *) t_packet;
     int			len;
@@ -2387,10 +2378,6 @@ wlmmcread(u_int base, u_short reg)
 static void
 getsnr(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
-    short	base = sc->base;
-    register int s;
-
     MMC_WRITE(MMC_FREEZE,1);
     /* 
      * SNR retrieval procedure :