Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys remove unused



details:   https://anonhg.NetBSD.org/src/rev/7d71b75dbf4f
branches:  trunk
changeset: 794741:7d71b75dbf4f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 23 02:54:12 2014 +0000

description:
remove unused

diffstat:

 sys/compat/ndis/kern_ndis.c |  25 ++++---------------------
 sys/dev/pci/iwic_dchan.c    |   8 ++++----
 2 files changed, 8 insertions(+), 25 deletions(-)

diffs (116 lines):

diff -r 4067bb977ee8 -r 7d71b75dbf4f sys/compat/ndis/kern_ndis.c
--- a/sys/compat/ndis/kern_ndis.c       Sun Mar 23 02:44:19 2014 +0000
+++ b/sys/compat/ndis/kern_ndis.c       Sun Mar 23 02:54:12 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_ndis.c,v 1.24 2013/09/19 18:50:35 christos Exp $  */
+/*     $NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $  */
 
 /*-
  * Copyright (c) 2003
@@ -37,7 +37,7 @@
 __FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.24 2013/09/19 18:50:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -579,14 +579,11 @@
 {
        struct ndis_req         *r;
        struct ndisqhead        *q;
-       struct proc             *p;
 
        if (t == NDIS_TASKQUEUE) {
                q = &ndis_ttodo;
-               p = ndis_tproc.np_p;
        } else {
                q = &ndis_itodo;
-               p = ndis_iproc.np_p;
        }
 
        mtx_lock_spin(&ndis_thr_mtx);
@@ -1484,7 +1481,6 @@
        ndis_handle             adapter;
        __stdcall ndis_setinfo_handler  setfunc;
        uint32_t                byteswritten = 0, bytesneeded = 0;
-       int                     error;
        uint8_t                 irql = 0;       /* XXX: gcc */
 
        /*
@@ -1527,9 +1523,8 @@
 
        if (rval == NDIS_STATUS_PENDING) {
                mtx_lock(&ndis_req_mtx);
-               error = mtsleep(&sc->ndis_block->nmb_setstat,
-                               PZERO | PNORELOCK, 
-                               "ndisset", 5 * hz, &ndis_req_mtx);
+               mtsleep(&sc->ndis_block->nmb_setstat, PZERO | PNORELOCK, 
+                   "ndisset", 5 * hz, &ndis_req_mtx);
                rval = sc->ndis_block->nmb_setstat;
        }
 
@@ -1708,16 +1703,10 @@
        ndis_handle             adapter;
        __stdcall ndis_reset_handler    resetfunc;
        uint8_t                 addressing_reset;
-       struct ifnet            *ifp;
        int                     rval;
        uint8_t                 irql = 0;       /* XXX: gcc */
 
        sc = arg;
-#ifdef __FreeBSD__
-       ifp = &sc->arpcom.ac_if;
-#else
-       ifp = &sc->arpcom.ec_if;
-#endif
 
        adapter = sc->ndis_block->nmb_miniportadapterctx;
        resetfunc = sc->ndis_chars->nmc_reset_func;
@@ -1746,14 +1735,8 @@
        struct ndis_softc       *sc;
        ndis_handle             adapter;
        __stdcall ndis_halt_handler     haltfunc;
-       struct ifnet            *ifp;
 
        sc = arg;
-#ifdef __FreeBSD__
-       ifp = &sc->arpcom.ac_if;
-#else
-       ifp = &sc->arpcom.ec_if;
-#endif
 
        NDIS_LOCK(sc);
        
diff -r 4067bb977ee8 -r 7d71b75dbf4f sys/dev/pci/iwic_dchan.c
--- a/sys/dev/pci/iwic_dchan.c  Sun Mar 23 02:44:19 2014 +0000
+++ b/sys/dev/pci/iwic_dchan.c  Sun Mar 23 02:54:12 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iwic_dchan.c,v 1.8 2014/03/23 02:53:12 christos Exp $  */
+/*     $NetBSD: iwic_dchan.c,v 1.9 2014/03/23 02:54: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.8 2014/03/23 02:53:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.9 2014/03/23 02:54:12 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -351,10 +351,10 @@
                }
                else
                {
-                       int hi, lo;
+                       int lo;
 
                        lo = IWIC_READ(sc, D_RBCL);
-                       hi = IWIC_READ(sc, D_RBCH);
+                       (void)IWIC_READ(sc, D_RBCH);
                        lo = lo & 0x3f;
 
                        if (lo == 0)



Home | Main Index | Thread Index | Old Index