Module Name: src
Committed By: christos
Date: Fri Nov 8 03:12:17 UTC 2013
Modified Files:
src/sys/dev/ic: interwave.c
src/sys/dev/isa: if_iy.c ym.c
src/sys/dev/mca: if_tr_mca.c
src/sys/dev/usb: if_upgt.c xhci.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/interwave.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/isa/ym.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mca/if_tr_mca.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/interwave.c
diff -u src/sys/dev/ic/interwave.c:1.37 src/sys/dev/ic/interwave.c:1.38
--- src/sys/dev/ic/interwave.c:1.37 Sat Oct 27 13:18:20 2012
+++ src/sys/dev/ic/interwave.c Thu Nov 7 22:12:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: interwave.c,v 1.37 2012/10/27 17:18:20 chs Exp $ */
+/* $NetBSD: interwave.c,v 1.38 2013/11/08 03:12:17 christos Exp $ */
/*
* Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.37 2012/10/27 17:18:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.38 2013/11/08 03:12:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -576,6 +576,7 @@ iw_set_speed(struct iw_softc *sc, u_long
IW_READ_CODEC_1(CRDFI, reg);
DPRINTF((" CRDFI %x ", reg));
+ __USE(reg);
return freq;
}
Index: src/sys/dev/isa/if_iy.c
diff -u src/sys/dev/isa/if_iy.c:1.91 src/sys/dev/isa/if_iy.c:1.92
--- src/sys/dev/isa/if_iy.c:1.91 Sat Oct 27 13:18:24 2012
+++ src/sys/dev/isa/if_iy.c Thu Nov 7 22:12:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.91 2012/10/27 17:18:24 chs Exp $ */
+/* $NetBSD: if_iy.c,v 1.92 2013/11/08 03:12:17 christos Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.91 2012/10/27 17:18:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.92 2013/11/08 03:12:17 christos Exp $");
#include "opt_inet.h"
@@ -1088,6 +1088,8 @@ iy_intr_rx(struct iy_softc *sc)
printf("%s: pck at 0x%04x stat %s next 0x%x len 0x%x\n",
device_xname(sc->sc_dev), rxadrs, sbuf, rxnext, rxlen);
}
+#else
+ __USE(rxstatus);
#endif
iyget(sc, iot, ioh, rxlen);
@@ -1346,6 +1348,7 @@ iy_mc_setup(struct iy_softc *sc)
ETHER_NEXT_MULTI(step, enm);
}
dum = bus_space_read_2(iot, ioh, MEM_PORT_REG); /* dummy read */
+ __USE(dum);
bus_space_write_2(iot, ioh, XMT_ADDR_REG, last);
bus_space_write_1(iot, ioh, 0, MC_SETUP_CMD);
Index: src/sys/dev/isa/ym.c
diff -u src/sys/dev/isa/ym.c:1.43 src/sys/dev/isa/ym.c:1.44
--- src/sys/dev/isa/ym.c:1.43 Wed Nov 23 22:35:58 2011
+++ src/sys/dev/isa/ym.c Thu Nov 7 22:12:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.43 2011/11/24 03:35:58 mrg Exp $ */
+/* $NetBSD: ym.c,v 1.44 2013/11/08 03:12:17 christos Exp $ */
/*-
* Copyright (c) 1999-2002, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.43 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.44 2013/11/08 03:12:17 christos Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -505,6 +505,8 @@ ym_hvol_to_master_gain(struct ym_softc *
/* Notify the change to async processes. */
if (changed && sc->sc_audiodev)
mixer_signal(sc->sc_audiodev);
+#else
+ __USE(changed);
#endif
}
Index: src/sys/dev/mca/if_tr_mca.c
diff -u src/sys/dev/mca/if_tr_mca.c:1.22 src/sys/dev/mca/if_tr_mca.c:1.23
--- src/sys/dev/mca/if_tr_mca.c:1.22 Sat Oct 27 13:18:26 2012
+++ src/sys/dev/mca/if_tr_mca.c Thu Nov 7 22:12:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_mca.c,v 1.22 2012/10/27 17:18:26 chs Exp $ */
+/* $NetBSD: if_tr_mca.c,v 1.23 2013/11/08 03:12:17 christos Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.22 2012/10/27 17:18:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.23 2013/11/08 03:12:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,6 +117,7 @@ tr_mca_attach(device_t parent, device_t
pos3 = mca_conf_read(ma->ma_mc, ma->ma_slot, 3);
pos4 = mca_conf_read(ma->ma_mc, ma->ma_slot, 4);
pos5 = mca_conf_read(ma->ma_mc, ma->ma_slot, 5);
+ __USE(pos5);
/*
* POS register 2: (adf pos0)
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.9 src/sys/dev/usb/if_upgt.c:1.10
--- src/sys/dev/usb/if_upgt.c:1.9 Fri Mar 29 23:15:53 2013
+++ src/sys/dev/usb/if_upgt.c Thu Nov 7 22:12:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.9 2013/03/30 03:15:53 christos Exp $ */
+/* $NetBSD: if_upgt.c,v 1.10 2013/11/08 03:12:17 christos Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.9 2013/03/30 03:15:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.10 2013/11/08 03:12:17 christos Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -1137,6 +1137,7 @@ upgt_eeprom_parse_freq3(struct upgt_soft
DPRINTF(2, "%s: flags=0x%02x\n", device_xname(sc->sc_dev), flags);
DPRINTF(2, "%s: elements=%d\n", device_xname(sc->sc_dev), elements);
+ __USE(flags);
for (i = 0; i < elements; i++) {
channel = ieee80211_mhz2ieee(le16toh(freq3[i].freq), 0);
@@ -1171,6 +1172,7 @@ upgt_eeprom_parse_freq4(struct upgt_soft
DPRINTF(2, "%s: flags=0x%02x\n", device_xname(sc->sc_dev), flags);
DPRINTF(2, "%s: elements=%d\n", device_xname(sc->sc_dev), elements);
DPRINTF(2, "%s: settings=%d\n", device_xname(sc->sc_dev), settings);
+ __USE(flags);
for (i = 0; i < elements; i++) {
channel = ieee80211_mhz2ieee(le16toh(freq4_1[i].freq), 0);
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.6 src/sys/dev/usb/xhci.c:1.7
--- src/sys/dev/usb/xhci.c:1.6 Mon Nov 4 03:08:58 2013
+++ src/sys/dev/usb/xhci.c Thu Nov 7 22:12:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.6 2013/11/04 08:08:58 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.7 2013/11/08 03:12:17 christos Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.6 2013/11/04 08:08:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.7 2013/11/08 03:12:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -570,7 +570,7 @@ usbd_status
xhci_init(struct xhci_softc *sc)
{
bus_size_t bsz;
- uint32_t cap, hcs1, hcs2, hcs3, hcc, dboff, rtsoff;
+ uint32_t cap, hcs1, hcs2, hcc, dboff, rtsoff;
uint32_t ecp, ecr;
uint32_t usbcmd, usbsts, pagesize, config;
int i;
@@ -605,7 +605,7 @@ xhci_init(struct xhci_softc *sc)
sc->sc_maxintrs = XHCI_HCS1_MAXINTRS(hcs1);
sc->sc_maxports = XHCI_HCS1_MAXPORTS(hcs1);
hcs2 = xhci_cap_read_4(sc, XHCI_HCSPARAMS2);
- hcs3 = xhci_cap_read_4(sc, XHCI_HCSPARAMS3);
+ (void)xhci_cap_read_4(sc, XHCI_HCSPARAMS3);
hcc = xhci_cap_read_4(sc, XHCI_HCCPARAMS);
sc->sc_ac64 = XHCI_HCC_AC64(hcc);
